pkgconfig: Add 0.28, fix build (tested on gcc4)

(cherry picked from commit 7bea1e79b9)
This commit is contained in:
Alexander von Gluck IV
2013-08-18 20:09:47 -05:00
committed by Oliver Tappe
parent e6c80c4f2a
commit 36e1819c3c
2 changed files with 80 additions and 0 deletions

View File

@@ -0,0 +1,50 @@
diff -Naur pkg-config-0.28/glib/configure.ac pkg-config-0.28-haiku/glib/configure.ac
--- pkg-config-0.28/glib/configure.ac 2012-10-13 09:35:36.033030144 -0500
+++ pkg-config-0.28-haiku/glib/configure.ac 2013-08-18 19:05:41.008388608 -0500
@@ -288,7 +288,6 @@
AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
AC_LANG_RESTORE
-AM_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_INSTALL
@@ -1031,38 +1030,6 @@
AC_CHECK_FUNCS(getprotobyname_r endservent if_nametoindex)
AC_CHECK_HEADERS([netdb.h wspiapi.h arpa/nameser_compat.h])
-if test $glib_native_win32 = no; then
- # 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 <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
- #include <resolv.h>
- ],[
- res_query("test", 0, 0, (void *)0, 0);
- ],[AC_MSG_RESULT([yes])],
- [save_libs="$LIBS"
- LIBS="-lresolv $LIBS"
- AC_TRY_LINK([#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
- #include <resolv.h>
- ],[
- 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 <resolv.h>],
- [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())]))
-fi
AC_SUBST(NETWORK_LIBS)
AC_CHECK_HEADER([linux/netlink.h],

View File

@@ -0,0 +1,30 @@
DESCRIPTION="pkgconfig"
HOMEPAGE="http://pkg-config.freedesktop.org/wiki/"
SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz"
CHECKSUM_MD5="aa3c86e67551adc3ac865160e34a2a0d"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
# because we patched configure.ac...
cd pkg-config-0.28/glib
autoreconf -i -f
cd ..
# do the needful...
autoreconf -i -f
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--docdir=$COMMON_DOCS/doc/pkg-config \
--mandir=$COMMON_DOCS/man \
--disable-host-tool \
--with-internal-glib
make
}
INSTALL {
cd pkg-config-0.28
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="1998, 2001-2006 Red Hat Inc."