domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added our own pkg-config wrapper, making the sed foo on *.pc files obselete 1/2

Browse Source 
SVN-Revision: 9162
This commit is contained in:
John Crispin
2007-10-06 23:50:47 +00:00
parent 446881738f
commit c3847b8e5d
6 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/e2fsprogs/Makefile
View File

@@ -101,8 +101,6 @@ define Build/InstallDev
BUILDCC="$(HOSTCC)" \
DESTDIR="$(1)" \
install-libs
$(SED) 's,-I$$$${includedir},,g' $(1)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc
$(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc
endef
define Build/UninstallDev

2
package/libjson-c/Makefile
View File

@@ -42,8 +42,6 @@ define Build/InstallDev
$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,-I$$$${includedir}/,-I$(1)/usr/include/,g' $(1)/usr/lib/pkgconfig/json.pc
$(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/json.pc
endef
define Build/UninstallDev

2
package/openssl/Makefile
View File

@@ -115,8 +115,6 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,^includedir=.*,includedir=$(1)/usr/include,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
$(SED) 's,^libdir=.*,libdir=$(1)/usr/lib,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
$(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
endef

2
tools/Makefile
View File

@@ -9,7 +9,7 @@
curdir:=tools
# subdirectories to descend into
$(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache)
$(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config $(if $(CONFIG_CCACHE),ccache)
# builddir dependencies
$(curdir)/squashfs/compile := $(curdir)/lzma/install

35
tools/pkg-config/Makefile Normal file
View File

@@ -0,0 +1,35 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=pkg-config
PKG_VERSION:=0.22
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://pkgconfig.freedesktop.org/releases/
PKG_MD5SUM:=fd5c547e9d66ba49bc735ccb8c791f2a
include $(INCLUDE_DIR)/host-build.mk
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)
endef
define Build/Install
$(MAKE) -C $(PKG_BUILD_DIR) \
install
mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real
$(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
endef
define Build/Clean
$(MAKE) -C $(PKG_BUILD_DIR) uninstall
$(MAKE) -C $(PKG_BUILD_DIR) clean
$(call Build/Clean/Default)
endef
$(eval $(call HostBuild))

3
tools/pkg-config/files/pkg-config Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/sh
pkg-config.real $@ --define-variable=libdir=${STAGING_DIR}/usr/lib --define-variable=includedir=${STAGING_DIR}/usr/include