diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-02-07 09:00:58 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-02-07 09:00:58 (GMT) |
| commit | fab6f7f5539365614dc222fb894a8af6beb91e51 (patch) | |
| tree | c3da4a789679472f80804735bcdb58a23a0baf6a /src | |
| parent | 17c2153bc550a54a1a0e70eb1fed8115f21b850e (diff) | |
| download | mxe-fab6f7f5539365614dc222fb894a8af6beb91e51.zip mxe-fab6f7f5539365614dc222fb894a8af6beb91e51.tar.gz mxe-fab6f7f5539365614dc222fb894a8af6beb91e51.tar.bz2 | |
use the natively installed pkg-config instead of building a custom pkg-config
Diffstat (limited to 'src')
| -rw-r--r-- | src/gcc.mk | 6 | ||||
| -rw-r--r-- | src/pkg_config.mk | 28 |
2 files changed, 6 insertions, 28 deletions
@@ -77,4 +77,10 @@ define $(PKG)_BUILD --host='$(TARGET)' \ LIBS='-lws2_32' $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install + + # create pkg-config script + (echo '#!/bin/sh'; \ + echo 'PKG_CONFIG_PATH= PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config "$$@"') \ + > '$(PREFIX)/bin/$(TARGET)-pkg-config' + chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' endef diff --git a/src/pkg_config.mk b/src/pkg_config.mk deleted file mode 100644 index 31f5f92..0000000 --- a/src/pkg_config.mk +++ /dev/null @@ -1,28 +0,0 @@ -# This file is part of mingw-cross-env. -# See doc/index.html or doc/README for further information. - -# pkg-config -PKG := pkg_config -$(PKG)_IGNORE := -$(PKG)_VERSION := 0.23 -$(PKG)_CHECKSUM := b59dddd6b5320bd74c0f74b3339618a327096b2a -$(PKG)_SUBDIR := pkg-config-$($(PKG)_VERSION) -$(PKG)_FILE := pkg-config-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://pkg-config.freedesktop.org/ -$(PKG)_URL := http://pkgconfig.freedesktop.org/releases/$($(PKG)_FILE) -$(PKG)_DEPS := - -define $(PKG)_UPDATE - wget -q -O- 'http://pkgconfig.freedesktop.org/' | \ - $(SED) -n 's,.*current release of pkg-config is version \([0-9][^ ]*\) and.*,\1,p' | \ - head -1 -endef - -define $(PKG)_BUILD - cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install - $(INSTALL) -d '$(PREFIX)/bin' - rm -f '$(PREFIX)/bin/$(TARGET)-pkg-config' - ln -s '../$(TARGET)/bin/pkg-config' '$(PREFIX)/bin/$(TARGET)-pkg-config' -endef |