From f04a92e1b8fe3148d554236b990e09fd6035b2b9 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 5 Oct 2009 14:57:05 +0000 Subject: [PATCH] [packages] serdisplib: update to v1.97.8, cleanup git-svn-id: svn://svn.openwrt.org/openwrt/packages@17887 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/serdisplib/Makefile | 15 ++++++--------- libs/serdisplib/patches/101-test_shared.patch | 13 ------------- 2 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 libs/serdisplib/patches/101-test_shared.patch diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile index 9e8edbe24..96cb4f744 100644 --- a/libs/serdisplib/Makefile +++ b/libs/serdisplib/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=serdisplib -PKG_VERSION:=1.97.7 +PKG_VERSION:=1.97.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/serdisplib -PKG_MD5SUM:=ae6ca7c14ca92b0fc9dbb5df4a05a4c7 +PKG_MD5SUM:=2aa91c43d01d2dfc9fbc1116e3063ae1 include $(INCLUDE_DIR)/package.mk @@ -30,12 +30,9 @@ define Package/serdisplib/description with built-in controllers. endef -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - ) -endef +CONFIGURE_ARGS+= \ + --enable-shared \ + --enable-static \ TARGET_CFLAGS += $(FPIC) diff --git a/libs/serdisplib/patches/101-test_shared.patch b/libs/serdisplib/patches/101-test_shared.patch deleted file mode 100644 index fbdfa468c..000000000 --- a/libs/serdisplib/patches/101-test_shared.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -103,8 +103,8 @@ - cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR) - cd $(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so - --testserdisp: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS) -- $(CC) -o testserdisp $(OBJECTS) $(LIB_DIR)/$(LIB_STATIC) $(TARGET_LDFLAGS) $(EXTRA_LIBS) -+testserdisp: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS) -+ $(CC) -o testserdisp $(OBJECTS) $(LIB_DIR)/$(LIB_SHARED) $(TARGET_LDFLAGS) $(EXTRA_LIBS) - - clean: - /bin/rm -f $(OBJECTS) $(LIB_OBJECTS) $(LIB_DIR)/*.a $(LIB_DIR)/*.so* -- 2.11.0