id3lib: add libtoolism fixes, Makefile cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/packages@8603 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
a462f853ff
commit
c2d9653fae
@ -15,10 +15,6 @@ PKG_RELEASE:=1
|
|||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=@SF/id3lib
|
PKG_SOURCE_URL:=@SF/id3lib
|
||||||
PKG_MD5SUM:=19f27ddd2dda4b2d26a559a4f0f402a7
|
PKG_MD5SUM:=19f27ddd2dda4b2d26a559a4f0f402a7
|
||||||
PKG_CAT:=zcat
|
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
|
||||||
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
@ -30,23 +26,23 @@ define Package/id3lib
|
|||||||
URL:=http://www.id3lib.org/
|
URL:=http://www.id3lib.org/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# commas are interpreted by the $(call ...) macro, so define a intermediate variable holding our settings
|
CONFIGURE_ARGS += \
|
||||||
PKG_CONFIGURE_LIBS:=-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lz,-lm,-lc
|
--enable-shared \
|
||||||
|
--enable-static \
|
||||||
|
|
||||||
|
CONFIGURE_VARS += \
|
||||||
|
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti" \
|
||||||
|
LIBS="-nodefaultlibs -lz -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
$(call Build/Configure/Default, \
|
$(call Build/Configure/Default)
|
||||||
--enable-shared \
|
$(call libtool_disable_rpath)
|
||||||
--enable-static \
|
|
||||||
, \
|
|
||||||
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti" \
|
|
||||||
LIBS="$(PKG_CONFIGURE_LIBS)" \
|
|
||||||
)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) all
|
||||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
|
||||||
all install
|
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/InstallDev
|
define Build/InstallDev
|
||||||
@ -59,8 +55,7 @@ define Build/InstallDev
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/UninstallDev
|
define Build/UninstallDev
|
||||||
rm -rf \
|
rm -rf $(STAGING_DIR)/usr/include/id3 \
|
||||||
$(STAGING_DIR)/usr/include/id3 \
|
|
||||||
$(STAGING_DIR)/usr/include/id3.h \
|
$(STAGING_DIR)/usr/include/id3.h \
|
||||||
$(STAGING_DIR)/usr/lib/libid3.{a,so} \
|
$(STAGING_DIR)/usr/lib/libid3.{a,so} \
|
||||||
$(STAGING_DIR)/usr/lib/libid3-*.so.*
|
$(STAGING_DIR)/usr/lib/libid3-*.so.*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user