diff --git a/dev-util/pkgconfig/patches/pkgconfig-0.29.2.patchset b/dev-util/pkgconfig/patches/pkgconfig-0.29.2.patchset new file mode 100644 index 000000000..023d03fa9 --- /dev/null +++ b/dev-util/pkgconfig/patches/pkgconfig-0.29.2.patchset @@ -0,0 +1,78 @@ +From 6e759ba387f142a59edb1b3f70f1a2b3c710b3ab Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 29 Nov 2015 15:49:57 +0000 +Subject: Haiku patch + +* Actually use pc_path when building pkgconfig. +* skip network libs in glib. + +diff --git a/Makefile.am b/Makefile.am +index e46c798..b431bcb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,7 @@ AM_CPPFLAGS = \ + -DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(system_library_path)\"" + endif + +-AM_CFLAGS = \ ++AM_CFLAGS = $(AM_CPPFLAGS)\ + $(WARN_CFLAGS) \ + $(GCOV_CFLAGS) \ + $(GLIB_CFLAGS) +diff --git a/glib/configure.ac b/glib/configure.ac +index ffa7869..48f7537 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -1094,49 +1094,6 @@ AS_IF([test $glib_native_win32 = yes], [ + [AC_MSG_ERROR([could not compile test program either way])])])]) + AC_SUBST(NAMESER_COMPAT_INCLUDE) + +- # We can't just use AC_CHECK_FUNC/AC_CHECK_LIB here. Bug 586150 +- NETWORK_LIBS="" +- AC_MSG_CHECKING([for res_query]) +- AC_TRY_LINK([#include +- #include +- #include +- #include +- ],[ +- res_query("test", 0, 0, (void *)0, 0); +- ],[AC_MSG_RESULT([yes])], +- [save_libs="$LIBS" +- LIBS="-lresolv $LIBS" +- AC_TRY_LINK([#include +- #include +- #include +- #include +- ],[ +- res_query("test", 0, 0, (void *)0, 0); +- ],[AC_MSG_RESULT([in -lresolv]) +- NETWORK_LIBS="-lresolv $NETWORK_LIBS"], +- [LIBS="-lbind $save_libs" +- AC_TRY_LINK([#include ], +- [res_query("test", 0, 0, (void *)0, 0);], +- [AC_MSG_RESULT([in -lbind]) +- NETWORK_LIBS="-lbind $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())])) +- save_libs="$LIBS" +- LIBS="$LIBS $NETWORK_LIBS" +- AC_MSG_CHECKING([for res_init]) +- AC_TRY_LINK([#include +- #include +- #include +- #include +- ],[ +- res_init(); +- ],[AC_MSG_RESULT([yes]) +- AC_DEFINE(HAVE_RES_INIT, 1, [Define to 1 if you have the 'res_init' function.]) +- ],[AC_MSG_RESULT([no])]) +- LIBS="$save_libs" + ]) + AC_SUBST(NETWORK_LIBS) + +-- +2.2.2 + diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.recipe b/dev-util/pkgconfig/pkgconfig-0.29.2.recipe new file mode 100644 index 000000000..e0662cace --- /dev/null +++ b/dev-util/pkgconfig/pkgconfig-0.29.2.recipe @@ -0,0 +1,73 @@ +SUMMARY="Helper tool for compiling applications and libraries" +DESCRIPTION="pkg-config 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="https://www.freedesktop.org/wiki/Software/pkg-config/" +COPYRIGHT="1994-1996, 1999-2002, 2004-2016 Free Software Foundation, Inc." +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://pkg-config.freedesktop.org/releases/pkg-config-$portVersion.tar.gz" +CHECKSUM_SHA256="6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591" +SOURCE_DIR="pkg-config-$portVersion" +PATCHES="pkgconfig-$portVersion.patchset" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + pkgconfig$secondaryArchSuffix = $portVersion compat >= 0.27 + cmd:pkg_config$secondaryArchSuffix = $portVersion compat >= 0.27 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libiconv$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:autoreconf + cmd:awk + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:xargs + " + +BUILD() +{ + pcPathSubdir="/lib${secondaryArchSuffix/_//}/pkgconfig" + pcPath="`finddir B_USER_NONPACKAGED_DEVELOP_DIRECTORY`$pcPathSubdir" + pcPath="$pcPath:`finddir B_USER_DEVELOP_DIRECTORY`$pcPathSubdir" + pcPath="$pcPath:`finddir B_SYSTEM_NONPACKAGED_DEVELOP_DIRECTORY`$pcPathSubdir" + pcPath="$pcPath:`finddir B_SYSTEM_DEVELOP_DIRECTORY`$pcPathSubdir" + + # because we patched configure.ac... + cd glib + autoreconf -i -f + cd .. + # do the needful... + autoreconf -i -f + automake --add-missing + export CFLAGS=-D_BSD_SOURCE + COMMON_DOCS=$docDir + runConfigure ./configure \ + --disable-host-tool \ + --with-internal-glib \ + --with-pc-path="$pcPath" + make $jobArgs +} + +INSTALL() +{ + make install +}