# HG changeset patch # User John W. Eaton # Date 1360115607 18000 # Node ID 169114e27438d6946006548b1ae329c2a819716d # Parent 7145a94e4f4e00e895e2063d3c57b586d30bafb6 also build pkg-config instead of expecting it to be present diff -r 7145a94e4f4e -r 169114e27438 Makefile --- a/Makefile Tue Feb 05 15:41:22 2013 -0500 +++ b/Makefile Tue Feb 05 20:53:27 2013 -0500 @@ -37,12 +37,12 @@ REQUIREMENTS := bash bison bzip2 flex \ gcc intltoolize \ - $(MAKE) openssl $(PATCH) $(PERL) pkg-config \ + $(MAKE) openssl $(PATCH) $(PERL) \ scons $(SED) unzip wget xz yasm LIBTOOL := libtool LIBTOOLIZE := libtoolize -BUILD_TOOLS := build-autoconf build-automake build-cmake build-libtool +BUILD_TOOLS := build-autoconf build-automake build-cmake build-libtool build-pkg-config PREFIX := $(PWD)/usr LOG_DIR := $(PWD)/log diff -r 7145a94e4f4e -r 169114e27438 index.html --- a/index.html Tue Feb 05 15:41:22 2013 -0500 +++ b/index.html Tue Feb 05 20:53:27 2013 -0500 @@ -989,6 +989,11 @@ libtool + pkg-config + 0.26 + pkg-config + + bzip2 1.0.6 bzip2 diff -r 7145a94e4f4e -r 169114e27438 src/build-pkg-config.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/build-pkg-config.mk Tue Feb 05 20:53:27 2013 -0500 @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := build-pkg-config +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := fd71a70b023b9087c8a7bb76a0dc135a61059652 +$(PKG)_SUBDIR := pkg-config-$($(PKG)_VERSION) +$(PKG)_FILE := pkg-config-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://pkgconfig.freedesktop.org/releases/$($(PKG)_FILE) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(1)/configure' \ + --prefix='$(PREFIX)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install +endef