From c16e16048e38fd9224eea512a5be55508429c4f2 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 26 Jul 2006 03:19:36 +0000 Subject: [PATCH] remove ref to host include and lib dirs from pkgconfig files git-svn-id: svn://svn.openwrt.org/openwrt/packages@4299 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/freetype/Makefile | 2 ++ libs/gnutls/Makefile | 2 ++ libs/howl/Makefile | 2 ++ libs/libpng/Makefile | 1 + libs/libxslt/Makefile | 6 +++++- libs/speex/Makefile | 2 ++ libs/sqlite2/Makefile | 2 ++ libs/sqlite3/Makefile | 2 ++ 8 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index 5ac0e392d..25de7a11d 100644 --- a/libs/freetype/Makefile +++ b/libs/freetype/Makefile @@ -88,6 +88,8 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir}/freetype2,,g' $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc + $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc endef define Build/UninstallDev diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index bb0f960e9..3185043d6 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -150,6 +150,8 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc + $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc mkdir -p $(STAGING_DIR)/usr/share/aclocal $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/ endef diff --git a/libs/howl/Makefile b/libs/howl/Makefile index 2fea756bc..4c71a20c5 100644 --- a/libs/howl/Makefile +++ b/libs/howl/Makefile @@ -164,6 +164,8 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(SED) 's,-I/usr/include,,g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc + $(SED) 's,-L/usr/lib/howl,,g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc endef define Build/UninstallDev diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index 47cbf579d..e3a9c57c8 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -87,6 +87,7 @@ define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,^[ILR]_opts=".\+",,g' $(STAGING_DIR)/usr/bin/libpng*-config + $(SED) 's,-I$$$${includedir}/libpng12,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libpng{,12}.pc endef define Build/UninstallDev diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 89f1e747a..dab7ab2ae 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -96,9 +96,13 @@ define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xslt-config - $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xslt-config $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xslt-config + $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xslt-config $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xslt-config + $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc + $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc + $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc + $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc endef define Build/UninstallDev diff --git a/libs/speex/Makefile b/libs/speex/Makefile index 62668681d..fba89a17d 100644 --- a/libs/speex/Makefile +++ b/libs/speex/Makefile @@ -93,6 +93,8 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc + $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc endef define Build/UninstallDev diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile index 1e5179f60..03ba6c26e 100644 --- a/libs/sqlite2/Makefile +++ b/libs/sqlite2/Makefile @@ -112,6 +112,8 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc + $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc endef define Build/UninstallDev diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile index 61df39901..1b6fbf28a 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -113,6 +113,8 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc + $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc endef define Build/UninstallDev -- 2.11.0