From: nbd Date: Thu, 27 Dec 2007 02:12:26 +0000 (+0000) Subject: lots of package cleanups/fixes X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=f2e55a8fb5b1ea33a3e8d20ff123c2a75e5384e0;p=packages.git lots of package cleanups/fixes git-svn-id: svn://svn.openwrt.org/openwrt/packages@9948 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/XOrg/app/fontconfig/Makefile b/XOrg/app/fontconfig/Makefile index e0000a4ec..f1a3c8029 100644 --- a/XOrg/app/fontconfig/Makefile +++ b/XOrg/app/fontconfig/Makefile @@ -14,11 +14,10 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://fontconfig.org/release/ +PKG_FIXUP=libtool include $(INCLUDE_DIR)/package.mk -CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" --disable-docs - define Package/fontconfig SECTION:=xorg-util CATEGORY:=Xorg @@ -38,8 +37,7 @@ endef define Build/Compile $(foreach dir,fc-case fc-lang fc-glyphname, $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) CFLAGS="";) - $(MAKE) -C $(PKG_BUILD_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install + $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install endef define Package/fontconfig/install @@ -52,7 +50,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libfontconfig.la endef $(eval $(call BuildPackage,fontconfig)) diff --git a/XOrg/app/xmms/Makefile b/XOrg/app/xmms/Makefile index cf9ee2488..c469de64b 100644 --- a/XOrg/app/xmms/Makefile +++ b/XOrg/app/xmms/Makefile @@ -37,7 +37,8 @@ CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lnotimpl" \ --disable-vorbis \ --disable-esd -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/gtk-1.2 +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/gtk-1.2 -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include +TARGET_LDFLAGS += -lgthread define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ @@ -53,8 +54,10 @@ define Build/Configure endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR=$(PKG_INSTALL_DIR) \ + LIBTOOL="libtool --tag=CC" \ + all install endef define Package/xmms/install diff --git a/XOrg/app/xmms/patches/glibfool.patch b/XOrg/app/xmms/patches/glibfool.patch deleted file mode 100644 index cd27fd036..000000000 --- a/XOrg/app/xmms/patches/glibfool.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN xmms-1.2.10.orig/libxmms/Makefile.in xmms-1.2.10/libxmms/Makefile.in ---- xmms-1.2.10.orig/libxmms/Makefile.in 2007-10-06 04:12:42.000000000 +0200 -+++ xmms-1.2.10/libxmms/Makefile.in 2007-10-06 04:13:52.000000000 +0200 -@@ -255,6 +255,9 @@ - done - libxmms.la: $(libxmms_la_OBJECTS) $(libxmms_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libxmms_la_LDFLAGS) $(libxmms_la_OBJECTS) $(libxmms_la_LIBADD) $(LIBS) -+ $(CCLD) -shared configfile.lo xmmsctrl.lo dirbrowser.lo util.lo formatter.lo titlestring.lo xentry.lo xconvert.lo \ -+ -Wl,--whole-archive -Wl,--no-whole-archive ${libxmms_la_LIBADD} \ -+ -lm -Wl,-rpath-link=/usr/src/owrt-X2/staging_dir/i686/usr/lib -Wl,-soname -Wl,libxmms.so.1 -o .libs/libxmms.so.1.3.1 - - mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core -diff -urN xmms-1.2.10.orig/xmms/Makefile.in xmms-1.2.10/xmms/Makefile.in ---- xmms-1.2.10.orig/xmms/Makefile.in 2007-10-06 04:12:42.000000000 +0200 -+++ xmms-1.2.10/xmms/Makefile.in 2007-10-06 04:16:44.000000000 +0200 -@@ -226,7 +226,7 @@ - - xmms_LDFLAGS = -export-dynamic - xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \ --@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@ -+@POSIX_LIBS@ -L../libxmms/.libs/ -lxmms @LTLIBINTL@ - - - INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ \ -@@ -341,7 +341,7 @@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(xmms_SOURCES) - HEADERS = $(xmmsinclude_HEADERS) ---- xmms-1.2.10.orig/wmxmms/Makefile.in 2007-10-06 04:12:42.000000000 +0200 -+++ xmms-1.2.10/wmxmms/Makefile.in 2007-10-06 04:24:28.000000000 +0200 -@@ -220,7 +220,7 @@ - xmmsdir = @xmmsdir@ - bin_PROGRAMS = wmxmms - --wmxmms_LDADD = @GTK_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@ -+wmxmms_LDADD = @GTK_LIBS@ -L../libxmms/.libs/ -lxmms @LTLIBINTL@ - - wmxmms_SOURCES = \ - getopt.c \ -@@ -259,7 +259,7 @@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(wmxmms_SOURCES) - DATA = $(wmxmms_DATA) diff --git a/XOrg/lib/atk/Makefile b/XOrg/lib/atk/Makefile index 2a13064a7..1ad8e5b3b 100644 --- a/XOrg/lib/atk/Makefile +++ b/XOrg/lib/atk/Makefile @@ -49,7 +49,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libatk-1.0.la endef define Package/atk/Install diff --git a/XOrg/lib/cairo/Makefile b/XOrg/lib/cairo/Makefile index f2123b6e0..1300bb278 100644 --- a/XOrg/lib/cairo/Makefile +++ b/XOrg/lib/cairo/Makefile @@ -14,11 +14,10 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= http://cairographics.org/releases/ +PKG_FIXUP = libtool include $(INCLUDE_DIR)/package.mk -EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - define Package/cairo SECTION:=xorg-libs CATEGORY:=Xorg @@ -48,9 +47,8 @@ define Build/InstallDev $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1)/ $(SED) "s,-L/usr/local/lib,,g" $(1)/usr/lib/libcairo.la - $(SED) "s,/usr/lib/libfontconfig.la,$(1)/usr/lib/libfontconfig.la,g" $(1)/usr/lib/libcairo.la - $(SED) "s,$(1)$(1),$(1),g" $(1)/usr/lib/libcairo.la - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libcairo.la + $(SED) "s,/usr/lib/libfontconfig.la,$(STAGING_DIR)/usr/lib/libfontconfig.la,g" $(1)/usr/lib/libcairo.la + $(SED) "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(1)/usr/lib/libcairo.la endef define Package/cairo/Install diff --git a/XOrg/lib/gtk-1.2.10/Makefile b/XOrg/lib/gtk-1.2.10/Makefile index 68a9d81e8..4635accd5 100644 --- a/XOrg/lib/gtk-1.2.10/Makefile +++ b/XOrg/lib/gtk-1.2.10/Makefile @@ -27,8 +27,8 @@ CONFIGURE_ARGS_XTRA+=--x-includes=$(STAGING_DIR)/usr/include/ \ --enable-static=yes EXTRA_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -EXTRA_LDFLAGS+=-lnotimpl +TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include +EXTRA_LDFLAGS+=-lnotimpl -lglib -lgmodule define Package/gtk-1.2.10 SECTION:=xorg-framework @@ -61,7 +61,6 @@ define Build/InstallDev $(INSTALL_DIR) $(2)/bin mv $(1)/usr/bin/gtk-config $(2)/bin/ $(SED) "s,libdirs=-L.*,libdirs=,g" $(2)/bin/gtk-config - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/lib{gtk,gdk}.la endef $(eval $(call BuildPackage,gtk-1.2.10)) diff --git a/XOrg/lib/gtk-2.8.20/Makefile b/XOrg/lib/gtk-2.8.20/Makefile index dbd7cfd66..bdcf50754 100644 --- a/XOrg/lib/gtk-2.8.20/Makefile +++ b/XOrg/lib/gtk-2.8.20/Makefile @@ -49,10 +49,9 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include} - $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/include/ + $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/lib{gtk,gdk}*-2.0.la endef $(eval $(call BuildPackage,gtk-2.8.20)) diff --git a/XOrg/lib/imlib2/Makefile b/XOrg/lib/imlib2/Makefile index 62e166238..bf6a9f5cd 100644 --- a/XOrg/lib/imlib2/Makefile +++ b/XOrg/lib/imlib2/Makefile @@ -14,6 +14,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/enlightenment +PKG_FIXUP = libtool include $(INCLUDE_DIR)/package.mk @@ -26,7 +27,6 @@ define Package/imlib2 endef CONFIGURE_ARGS+=--disable-gtktest LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - EXTRA_LDFLAGS+=-lnotimpl define Build/Configure @@ -49,7 +49,6 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libImlib2.la $(CP) $(PKG_BUILD_DIR)/src/modules/loaders/.libs/*.so $(1)/usr/lib/imlib2/loaders/ $(INSTALL_DIR) $(2)/bin mv $(1)/usr/bin/imlib2-config $(2)/bin/ diff --git a/XOrg/lib/libast/Makefile b/XOrg/lib/libast/Makefile index 5a53c50bb..00ec3916c 100644 --- a/XOrg/lib/libast/Makefile +++ b/XOrg/lib/libast/Makefile @@ -15,6 +15,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.eterm.org/download/ PKG_MD5SUM:=a9ec3b2da317f35869316e6d9571d296 +PKG_FIXUP:=libtol include $(INCLUDE_DIR)/package.mk @@ -52,7 +53,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*{la,so}* $(1)/usr/lib $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(2)/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libast*.la $(SED) "s,-I/usr/include,,g" $(2)/bin/libast-config $(SED) "s,-L/usr/lib,,g" $(2)/bin/libast-config $(SED) "s,-L/usr/X11R6/lib,,g" $(2)/bin/libast-config diff --git a/XOrg/lib/pango/Makefile b/XOrg/lib/pango/Makefile index ef09a73b0..6ca870c27 100644 --- a/XOrg/lib/pango/Makefile +++ b/XOrg/lib/pango/Makefile @@ -14,6 +14,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.12/ +PKG_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk @@ -57,7 +58,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(SED) "s,Libs:,Libs: -L$$$${libdir}/libiconv/lib/ -L$$$${libdir}/libintl/lib/ ,g" $(1)/usr/lib/pkgconfig/pango*.pc - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libpango*.la endef define Package/pango/Install diff --git a/XOrg/lib/xine-lib/Makefile b/XOrg/lib/xine-lib/Makefile index c12e6d5c6..dc082bcad 100644 --- a/XOrg/lib/xine-lib/Makefile +++ b/XOrg/lib/xine-lib/Makefile @@ -14,11 +14,11 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.sourceforge.net/xine/ +PKG_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk CONFIGURE_ARGS_XTRA+=--enable-static --disable-vcd -EXTRA_LDLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib define Package/xine-lib SECTION:=xorg-lib @@ -41,16 +41,14 @@ define Build/Configure endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) - $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR) - find $(PKG_INSTALL_DIR) -name lib*.*a | xargs rm -rf + $(MAKE) -C $(PKG_BUILD_DIR)/ all install DESTDIR=$(PKG_INSTALL_DIR) endef define Build/InstallDev $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - $(SED) 's,-I$$$${prefix}/include,-I$(1)/usr/include/,g' $(1)/usr/bin/xine-config - $(SED) 's,-L$$$${exec_prefix}/lib,-L$(1)/usr/lib/,g' $(1)/usr/bin/xine-config + $(SED) 's,-I$$$${prefix}/include,-I$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/xine-config + $(SED) 's,-L$$$${exec_prefix}/lib,-L$(STAGING_DIR)/usr/lib/,g' $(1)/usr/bin/xine-config $(INSTALL_DIR) $(2)/bin mv $(1)/usr/bin/xine-config $(2)/bin endef diff --git a/lang/python/Makefile b/lang/python/Makefile index 67c84ed23..c4d63d608 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -135,18 +135,18 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(1)/mk + $(INSTALL_DIR) $(1)/mk $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(INSTALL_DATA) ./python-package.mk $(1)/mk/ - mkdir -p $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/hostpython $(1)/usr/bin/ ln -sf hostpython $(1)/usr/bin/python - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ + ln -sf $(STAGING_DIR)/usr/bin/hostpython $(2)/bin/ + ln -sf $(STAGING_DIR)/usr/bin/python $(2)/bin/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(1)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION) \ - $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/libpython$(PYTHON_VERSION).a \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION) \ + $(PKG_BUILD_DIR)/libpython$(PYTHON_VERSION).a \ $(1)/usr/lib/ endef diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index 8a75a8cb7..6f09d2f48 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -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 diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 048711848..323fbc92b 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -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 diff --git a/libs/curl/Makefile b/libs/curl/Makefile index 061b4140c..b79b372e0 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -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 diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index 4dc5b4981..52a0bc276 100644 --- a/libs/freetype/Makefile +++ b/libs/freetype/Makefile @@ -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 diff --git a/libs/giflib/Makefile b/libs/giflib/Makefile index 1d4a44455..27fbfee44 100644 --- a/libs/giflib/Makefile +++ b/libs/giflib/Makefile @@ -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 diff --git a/libs/glib/Makefile b/libs/glib/Makefile index 6abd85edb..6d37b444c 100644 --- a/libs/glib/Makefile +++ b/libs/glib/Makefile @@ -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 diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 79e389b45..a09654228 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -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 diff --git a/libs/libart/Makefile b/libs/libart/Makefile index d30a6d91a..2af3c678e 100644 --- a/libs/libart/Makefile +++ b/libs/libart/Makefile @@ -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 diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index 83e820f06..410241a39 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -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 diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index d9a4811dc..f68847574 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -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 diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile index e086648e2..6b7297f8a 100644 --- a/libs/mysql/Makefile +++ b/libs/mysql/Makefile @@ -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/ diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile index 7975c9e00..d968ca794 100644 --- a/libs/pcre/Makefile +++ b/libs/pcre/Makefile @@ -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 diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 1cdfe6856..e58cdf6da 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -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 diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile index 6b2134f42..3b438fefb 100644 --- a/libs/uclibc++/Makefile +++ b/libs/uclibc++/Makefile @@ -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 diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile index 4ed775bdb..5ad2ec968 100644 --- a/libs/wxbase/Makefile +++ b/libs/wxbase/Makefile @@ -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 diff --git a/net/apache/Makefile b/net/apache/Makefile index 0658903ba..47dbcd065 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -80,9 +80,9 @@ endef define Build/Configure $(call Build/Configure/Default, \ - --with-apr="$(STAGING_DIR_HOST)/bin/apr-1-config" \ - --with-apr-util="$(STAGING_DIR_HOST)/bin/apu-1-config" \ - --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ + --with-apr="$(STAGING_DIR)/host/bin/apr-1-config" \ + --with-apr-util="$(STAGING_DIR)/host/bin/apu-1-config" \ + --with-pcre="$(STAGING_DIR)/host/bin/pcre-config" \ --enable-http \ --enable-ssl \ --enable-proxy \ diff --git a/net/subversion/Makefile b/net/subversion/Makefile index 4fe609455..d26cce30d 100644 --- a/net/subversion/Makefile +++ b/net/subversion/Makefile @@ -47,8 +47,8 @@ define Package/subversion-server endef CONFIGURE_ARGS += \ - --with-apr="$(STAGING_DIR_HOST)/bin/apr-1-config" \ - --with-apr-util="$(STAGING_DIR_HOST)/bin/apu-1-config" \ + --with-apr="$(STAGING_DIR)/host/bin/apr-1-config" \ + --with-apr-util="$(STAGING_DIR)/host/bin/apu-1-config" \ --with-neon="$(STAGING_DIR)/usr/include/neon" \ --disable-mod-activation \ --without-ruby-sitedir \ diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile index 2d0752cb8..88f3841b1 100644 --- a/utils/rrdtool/Makefile +++ b/utils/rrdtool/Makefile @@ -69,7 +69,6 @@ CONFIGURE_ARGS += \ --with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \ CONFIGURE_VARS += \ - CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \ LIBS="-lnotimpl" \ rd_cv_ieee_works=yes \ rd_cv_null_realloc=nope \