From 2af394537ab82816f1780eb24ee04b5aad58529b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 16:56:49 +0200 Subject: [PATCH] pkgconfig: add recipe for 0.27.1 --- .../patches/pkgconfig-0.27.1.patchset | 60 ++++++++++++++++++ dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 63 +++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset create mode 100644 dev-util/pkgconfig/pkgconfig-0.27.1.recipe diff --git a/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset b/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset new file mode 100644 index 000000000..2eb090a78 --- /dev/null +++ b/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset @@ -0,0 +1,60 @@ +From 2d186a28945868303f8e40b728058f979f77b3b5 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 14:59:02 +0200 +Subject: glib/configure.ac: use AC_PROG_CC instead of AM_PROG_CC_STDC + + +diff --git a/glib/configure.ac b/glib/configure.ac +index 9e48cc9..f51d103 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -288,7 +288,7 @@ AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) + AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) + AC_LANG_RESTORE + +-AM_PROG_CC_STDC ++AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_INSTALL + +-- +1.7.5 + + +From 8a711d6bac22f0334acf6eecc83a3b38b19e2409 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 16:16:06 +0200 +Subject: glib/configure.ac: search for stuff in -lnetwork + + +diff --git a/glib/configure.ac b/glib/configure.ac +index f51d103..d41bef3 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -1057,11 +1057,19 @@ if test $glib_native_win32 = no; then + [res_query("test", 0, 0, (void *)0, 0);], + [AC_MSG_RESULT([in -lbind]) + NETWORK_LIBS="-lbind $NETWORK_LIBS"], +- [AC_MSG_ERROR(not found)])]) ++ [LIBS="-lnetwork $save_libs" ++ AC_TRY_LINK([#include ], ++ [res_query("test", 0, 0, (void *)0, 0);], ++ [AC_MSG_RESULT([in -lbind]) ++ NETWORK_LIBS="-lnetwork $NETWORK_LIBS"], ++ [AC_MSG_ERROR(not found)])])]) + LIBS="$save_libs"]) +- AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket, +- [NETWORK_LIBS="-lsocket $NETWORK_LIBS"], +- [AC_MSG_ERROR(Could not find socket())])) ++ AC_CHECK_FUNC(socket, :, ++ AC_CHECK_LIB(socket, socket, ++ [NETWORK_LIBS="-lsocket $NETWORK_LIBS"], ++ [AC_CHECK_LIB(network, socket, ++ [NETWORK_LIBS="-lnetwork $NETWORK_LIBS"], ++ [AC_MSG_ERROR(Could not find socket())])])) + fi + AC_SUBST(NETWORK_LIBS) + +-- +1.7.5 + diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe new file mode 100644 index 000000000..74ccd4529 --- /dev/null +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -0,0 +1,63 @@ +SUMMARY="Helper tool for compiling applications and libraries" +DESCRIPTION="pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the correct compiler options on the command line so an application can use gcc -o test test.cpkg-config --libs --cflags glib-2.0 for instance, rather than hard-coding values on where to find glib (or other libraries). It is language-agnostic, so it can be used for defining the location of documentation tools, for instance." +HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" +LICENSE="GNU GPL v2" +COPYRIGHT="1998, 2001-2006 Red Hat Inc." +SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz" +CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="pkgconfig-0.27.1.patchset" + +PROVIDES=" + pkgconfig = $portVersion compat >= 0.27 + cmd:pkg_config = $portVersion compat >= 0.27 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libiconv + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:autoreconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="pkg-config-0.27.1" + +BUILD() +{ + cd glib + libtoolize --force --copy --install + autoreconf + cd .. + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + + pcPathSubdir="develop/lib/pkgconfig" + pcPath="/boot/common/non-packaged/$pcPathSubdir" + pcPath="$pcPath:/boot/common/$pcPathSubdir" + pcPath="$pcPath:/boot/system/$pcPathSubdir" + + runConfigure ./configure \ + --with-internal-glib \ + --with-pc_path="$pcPath" + make $jobArgs +} + +INSTALL() +{ + make install +}