haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

pkgconfig: glib part was missing in patch

Browse Source
This commit is contained in:
Jerome Duval
2015-11-29 21:17:58 +00:00
parent e0c5f79319
commit defeb512c0
1 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
dev-util/pkgconfig/patches/pkgconfig-0.29.patchset
View File

@@ -1,8 +1,10 @@
From 34a3b7c03b39d7ad8f0f207edf77334df5f3de46 Mon Sep 17 00:00:00 2001
From 6e759ba387f142a59edb1b3f70f1a2b3c710b3ab Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 29 Nov 2015 15:49:57 +0000
Subject: Actually use pc_path when building pkgconfig.
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
@@ -17,6 +19,60 @@ index e46c798..b431bcb 100644
$(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 <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())]))
- save_libs="$LIBS"
- LIBS="$LIBS $NETWORK_LIBS"
- AC_MSG_CHECKING([for res_init])
- AC_TRY_LINK([#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
- #include <resolv.h>
- ],[
- 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