Mercurial > mxe-octave

changeset 2972:169114e27438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
also build pkg-config instead of expecting it to be present
author John W. Eaton <jwe@octave.org>
date Tue, 05 Feb 2013 20:53:27 -0500
parents 7145a94e4f4e
children b5bdf006eebc
files Makefile index.html src/build-pkg-config.mk
diffstat 3 files changed, 30 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 @@
         <td id="build-libtool-website"><a href="http://www.gnu.org/software/libtool">libtool</a></td>
     </tr>
     <tr>
+        <td id="build-pkg-config-package">pkg-config</td>
+        <td id="build-pkg-config-version">0.26</td>
+        <td id="build-pkg-config-website"><a href="http://www.freedesktop.org/wiki/Software/pkg-config">pkg-config</a></td>
+    </tr>
+    <tr>
         <td id="bzip2-package">bzip2</td>
         <td id="bzip2-version">1.0.6</td>
         <td id="bzip2-website"><a href="http://www.bzip.org/">bzip2</a></td>
--- /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