bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lots of package cleanups/fixes

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@9948 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2007-12-27 02:12:26 +00:00
parent 76e8333cc6
commit f2e55a8fb5
30 changed files with 75 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/apr-util/Makefile
View File

@ -31,7 +31,7 @@ endef
CONFIGURE_ARGS += \
--with-pgsql=no \
--with-apr="$(STAGING_DIR_HOST)/bin/apr-1-config" \
--with-apr="$(STAGING_DIR)/host/bin/apr-1-config" \
--with-expat="$(STAGING_DIR)/usr" \
--without-sqlite2 \
--with-sqlite3="$(STAGING_DIR)/usr" \
@ -47,21 +47,18 @@ define Build/Compile
endef
define Build/InstallDev
mkdir -p $(2)/bin
$(INSTALL_DIR) $(2)/bin $(1)/usr/include/apr-1/ $(1)/usr/lib $(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
$(2)/bin
mkdir -p $(1)/usr/include/apr-1/
$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
$(1)/usr/include/apr-1/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
$(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
$(1)/usr/lib/pkgconfig/
$(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(2)/bin/apu-1-config
$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(2)/bin/apu-1-config
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(2)/bin/apu-1-config
$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(2)/bin/apu-1-config
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(2)/bin/apu-1-config
$(SED) 's,-L$$$$libdir,,g' $(2)/bin/apu-1-config
$(SED) 's,-R$$$$libdir,,g' $(2)/bin/apu-1-config
endef

16
libs/apr/Makefile
View File

@ -46,28 +46,24 @@ define Build/Compile
endef
define Build/InstallDev
mkdir -p $(2)/bin
$(INSTALL_DIR) $(2)/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1
$(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
$(2)/bin
mkdir -p $(1)/usr/include/apr-1
$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
$(1)/usr/include/apr-1/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
$(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
$(1)/usr/lib/pkgconfig/
mkdir -p $(1)/usr/share/build-1
$(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \
$(1)/usr/share/build-1/
$(SED) 's,^datadir=\"/usr/share\",datadir=\"$(1)/usr/share\",g' $(2)/bin/apr-1-config
$(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(1)/usr/share/build-1\",g' $(2)/bin/apr-1-config
$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(2)/bin/apr-1-config
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(2)/bin/apr-1-config
$(SED) 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(2)/bin/apr-1-config
$(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(2)/bin/apr-1-config
$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(2)/bin/apr-1-config
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(2)/bin/apr-1-config
$(SED) 's,-L$$$$libdir,,g' $(2)/bin/apr-1-config
$(SED) 's,-R$$$$libdir,,g' $(2)/bin/apr-1-config
$(SED) 's,/usr/share/build-1,$(1)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
$(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
endef
define Package/libapr/install

4
libs/curl/Makefile
View File

@ -79,14 +79,14 @@ define Build/Compile
endef
define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config
$(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/libcurl.pc
ln -sf $(1)/usr/bin/curl-config $(2)/bin/
ln -sf $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/
endef
define Package/curl/install

4
libs/freetype/Makefile
View File

@ -53,8 +53,8 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,-I$$$$includedir/freetype2,-I$(1)/usr/include/freetype2,g' $(2)/bin/freetype-config
$(SED) 's,/usr/include/freetype2/,$(1)/usr/include/freetype2/,g' $(2)/bin/freetype-config
$(SED) 's,-I$$$$includedir/freetype2,-I$(STAGING_DIR)/usr/include/freetype2,g' $(2)/bin/freetype-config
$(SED) 's,/usr/include/freetype2/,$(STAGING_DIR)/usr/include/freetype2/,g' $(2)/bin/freetype-config
endef
define Package/libfreetype/install

3
libs/giflib/Makefile
View File

@ -14,6 +14,7 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.sourceforge.net/libungif/
PKG_FIXUP := libtool
include $(INCLUDE_DIR)/package.mk
@ -47,8 +48,6 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/libgif.la $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/*.h $(1)/usr/include/
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libgif.la
$(SED) "s,installed.*,,g" $(1)/usr/lib/libgif.la
endef
define Package/giflib/install

4
libs/glib/Makefile
View File

@ -67,8 +67,8 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/
$(INSTALL_DIR) $(2)/bin
mv $(1)/usr/bin/glib-config $(2)/bin/
$(SED) 's,-I$$$${prefix}/include/glib,-I$(1)/usr/include/glib,g' $(2)/bin/glib-config
$(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(1)/usr/lib/glib,g' $(2)/bin/glib-config
$(SED) 's,-I$$$${prefix}/include/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(2)/bin/glib-config
$(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(2)/bin/glib-config
$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(2)/bin/glib-config
endef

5
libs/gnutls/Makefile
View File

@ -149,13 +149,10 @@ define Build/Compile
endef
define Build/InstallDev
mkdir -p $(1)/usr/bin
mkdir -p $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(2)/bin/
mkdir -p $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(1)/usr/lib/pkgconfig/
endef

17
libs/libart/Makefile
View File

@ -18,6 +18,7 @@ PKG_MD5SUM:=f1f6b3e5490f382535dccb288f5d8b14
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_lgpl-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk
@ -36,12 +37,9 @@ define Package/libart/description
especially suitable for embedded applications.
endef
define Build/Configure
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
)
endef
CONFIGURE_ARGS += \
--enable-shared \
--enable-static
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
@ -51,13 +49,10 @@ define Build/Compile
endef
define Build/InstallDev
mkdir -p $(1)/usr/bin
$(INSTALL_DEV) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(1)/usr/bin/
mkdir -p $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/libart-2.0 $(1)/usr/include/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{la,a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libart-2.0.pc $(1)/usr/lib/pkgconfig/
endef

7
libs/libgcrypt/Makefile
View File

@ -18,6 +18,7 @@ PKG_MD5SUM:=49810175ab672b19a02509d2a670b156
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk
@ -57,10 +58,10 @@ define Build/InstallDev
mkdir -p $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/share/aclocal
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{la,a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(1)/usr/share/aclocal/
$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(1)/usr/bin/libgcrypt-config
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/libgcrypt-config
$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/libgcrypt-config
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/libgcrypt-config
ln -sf $(1)/usr/bin/libgcrypt-config $(2)/bin/
endef

9
libs/libxslt/Makefile
View File

@ -70,19 +70,16 @@ define Build/Compile
endef
define Build/InstallDev
mkdir -p $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/
mkdir -p $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/libxslt $(1)/usr/include/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,-I$$$${includedir},,g' $(1)/usr/bin/xslt-config
$(SED) 's,-L$$$${libdir},,g' $(1)/usr/bin/xslt-config
$(SED) 's,-I$(1)/usr/include,,g' $(1)/usr/bin/xslt-config
$(SED) 's,-L$(1)/usr/lib,,g' $(1)/usr/bin/xslt-config
$(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(1)/usr/bin/xslt-config
$(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(1)/usr/bin/xslt-config
endef
define Package/libxslt/install

2
libs/mysql/Makefile
View File

@ -96,7 +96,7 @@ endef
define Build/InstallDev
$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/
ln -sf $(1)/usr/bin/mysql_config $(2)/bin/
ln -sf $(STAGING_DIR)/usr/bin/mysql_config $(2)/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(1)/usr/include/
# NOTE: needed for MySQL-Python
$(CP) $(PKG_BUILD_DIR)/include/mysqld_error.h $(1)/usr/include/mysql/

5
libs/pcre/Makefile
View File

@ -39,11 +39,10 @@ MAKE_FLAGS += \
all
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/pcre-config $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/include
ln -sf $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin
$(CP) $(PKG_BUILD_DIR)/pcre{,posix}.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.{a,so*} $(1)/usr/lib/
endef

2
libs/tiff/Makefile
View File

@ -14,6 +14,7 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= http://libtiff.maptools.org/dl/
PKG_FIXUP := libtool
include $(INCLUDE_DIR)/package.mk
@ -47,7 +48,6 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/{lib,include}
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libtif{f,fxx}.la
endef
define Package/tiff/Install

8
libs/uclibc++/Makefile
View File

@ -64,14 +64,12 @@ define Build/Compile
endef
define Build/InstallDev
mkdir -p $(2)/bin
$(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(2)/bin/
mkdir -p $(1)/usr/include/uClibc++
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(1)/usr/lib/
$(SED) 's|-I/include/|-I$(1)/usr/include/uClibc++/|g' $(2)/bin/g++-uc
$(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(2)/bin/g++-uc
$(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(2)/bin/g++-uc
$(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(2)/bin/g++-uc
# add another wrapper which links against both uClibc++ and libstdc++
$(INSTALL_BIN) $(2)/bin/g++-uc $(2)/bin/g++-uc+std
$(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(2)/bin/g++-uc+std

8
libs/wxbase/Makefile
View File

@ -113,16 +113,14 @@ define Build/Compile
endef
define Build/InstallDev
mkdir -p $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
$(CP) -L $(PKG_INSTALL_DIR)/usr/bin/wx-config $(1)/usr/bin/
mkdir -p $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.6 $(1)/usr/include/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/
$(SED) 's,-I$$$${includedir}/wx-2.6,-I$(1)/usr/include/wx-2.6,g' $(1)/usr/bin/wx-config
$(SED) 's,-I$$$${libdir}/wx/include,-I$(1)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config
$(SED) 's,-I$$$${includedir}/wx-2.6,-I$(STAGING_DIR)/usr/include/wx-2.6,g' $(1)/usr/bin/wx-config
$(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config
endef
define Package/libwxbase/install