pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: CVS commit: pkgsrc/devel/pkg-config
On Tue, Jan 29, 2008 at 10:47:36PM -0500, Dan McMahill wrote:
> Joerg Sonnenberger wrote:
>> Module Name: pkgsrc
>> Committed By: joerg
>> Date: Tue Jan 15 22:56:57 UTC 2008
>> Modified Files:
>> pkgsrc/devel/pkg-config: distinfo
>> Added Files:
>> pkgsrc/devel/pkg-config/patches: patch-ca patch-cb
>> Log Message:
>> Restore cross-compiling ability.
>> To generate a diff of this commit:
>> cvs rdiff -r1.11 -r1.12 pkgsrc/devel/pkg-config/distinfo
>> cvs rdiff -r0 -r1.1 pkgsrc/devel/pkg-config/patches/patch-ca \
>> pkgsrc/devel/pkg-config/patches/patch-cb
>
>
> this breaks normal compiling. Take a look at the glib-1.2.8/configure
> script produced by this patch and search for va_copy. You'll see that
> main() is defined twice and the test for va_copy then fails. This causes a
> build failure later on on NetBSD/alpha.
Does the attached patch work for you?
Joerg
Index: distinfo
===================================================================
RCS file: /data/repo/netbsd/pkgsrc/devel/pkg-config/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 15 Jan 2008 22:56:57 -0000 1.12
+++ distinfo 30 Jan 2008 14:26:28 -0000
@@ -10,5 +10,5 @@ SHA1 (patch-ad) = ad7805b2aa69e3c872fa35
SHA1 (patch-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
SHA1 (patch-af) = 1186777da42151583594fd137e135ef6a77ee09f
SHA1 (patch-ah) = 9b5e537f2c0606efa45078d02de53700f3d3439a
-SHA1 (patch-ca) = 35c356be48bc2656f652c714b780c644dc0aa879
-SHA1 (patch-cb) = 4ee19e36d7876a99f294c9c2efd19a9edc0e4236
+SHA1 (patch-ca) = eacefe584576fe3f78f4b0b52cfcd9199307a8d4
+SHA1 (patch-cb) = d8c7f26fbf9e485658a9c567eff9c4b336a4f300
Index: patches/patch-ca
===================================================================
RCS file: /data/repo/netbsd/pkgsrc/devel/pkg-config/patches/patch-ca,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ca
--- patches/patch-ca 15 Jan 2008 22:56:57 -0000 1.1
+++ patches/patch-ca 30 Jan 2008 14:26:20 -0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
+$NetBSD$
---- glib-1.2.8/configure.orig 2008-01-15 23:25:54.000000000 +0100
+--- glib-1.2.8/configure.orig 2007-06-18 23:36:00.000000000 +0200
+++ glib-1.2.8/configure
@@ -20267,119 +20267,6 @@ if test "x$GCC" = "xyes"; then
fi
@@ -352,10 +352,15 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -26135,42 +25970,40 @@ cat >>conftest.$ac_ext <<_ACEOF
- f (0, 42);
- return 0;
+@@ -26131,46 +25966,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+ exit (1);
+ va_end (args1); va_end (args2);
}
+- int main() {
+- f (0, 42);
+- return 0;
+- }
++
+int
+main ()
+{
@@ -415,7 +420,7 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56
fi
-@@ -26182,14 +26015,7 @@ if test "${glib_cv___va_copy+set}" = set
+@@ -26182,14 +26012,7 @@ if test "${glib_cv___va_copy+set}" = set
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -431,10 +436,15 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -26209,42 +26035,40 @@ cat >>conftest.$ac_ext <<_ACEOF
- f (0, 42);
- return 0;
+@@ -26205,46 +26028,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+ exit (1);
+ va_end (args1); va_end (args2);
}
+- int main() {
+- f (0, 42);
+- return 0;
+- }
++
+int
+main ()
+{
@@ -495,7 +505,7 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56
fi
-@@ -26256,14 +26080,7 @@ if test "${glib_cv_va_val_copy+set}" = s
+@@ -26256,14 +26074,7 @@ if test "${glib_cv_va_val_copy+set}" = s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -511,10 +521,15 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -26283,42 +26100,40 @@ cat >>conftest.$ac_ext <<_ACEOF
- f (0, 42);
- return 0;
+@@ -26279,46 +26090,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+ exit (1);
+ va_end (args1); va_end (args2);
}
+- int main() {
+- f (0, 42);
+- return 0;
+- }
++
+int
+main ()
+{
@@ -574,7 +589,7 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56
fi
-@@ -28655,6 +28470,15 @@ _ACEOF
+@@ -28655,6 +28461,15 @@ _ACEOF
@@ -590,7 +605,7 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56
glib_sysdefso="glibconfig-sysdefs.h"
glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16
POLLNVAL:32 | sed 's/:[^ ]*//g'`
if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-@@ -28748,7 +28572,7 @@ fi
+@@ -28748,7 +28563,7 @@ fi
rm -f confrun.c
Index: patches/patch-cb
===================================================================
RCS file: /data/repo/netbsd/pkgsrc/devel/pkg-config/patches/patch-cb,v
retrieving revision 1.1
diff -u -p -r1.1 patch-cb
--- patches/patch-cb 15 Jan 2008 22:56:57 -0000 1.1
+++ patches/patch-cb 30 Jan 2008 14:25:53 -0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-cb,v 1.1 2008/01/15 22:56:57 joerg Exp $
+$NetBSD$
---- glib-1.2.8/configure.in.orig 2008-01-15 23:26:43.000000000 +0100
+--- glib-1.2.8/configure.in.orig 2007-06-18 23:35:54.000000000 +0200
+++ glib-1.2.8/configure.in
@@ -157,26 +157,6 @@ if test "x$GCC" = "xyes"; then
fi
@@ -99,16 +99,19 @@ $NetBSD: patch-cb,v 1.1 2008/01/15 22:56
#include <stdarg.h>
void f (int i, ...) {
va_list args1, args2;
-@@ -414,16 +392,15 @@ AC_CACHE_VAL(glib_cv_va_copy,[
- int main() {
- f (0, 42);
- return 0;
+@@ -411,19 +389,15 @@ AC_CACHE_VAL(glib_cv_va_copy,[
+ exit (1);
+ va_end (args1); va_end (args2);
+ }
+- int main() {
+- f (0, 42);
+- return 0;
- }],
- glib_cv_va_copy=yes
- ,
- glib_cv_va_copy=no
- ,)
-+ }])],
++ ])],
+ [glib_cv_va_copy=yes],
+ [glib_cv_va_copy=no])
])
@@ -121,16 +124,19 @@ $NetBSD: patch-cb,v 1.1 2008/01/15 22:56
#include <stdarg.h>
void f (int i, ...) {
va_list args1, args2;
-@@ -436,16 +413,15 @@ AC_CACHE_VAL(glib_cv___va_copy,[
- int main() {
- f (0, 42);
- return 0;
+@@ -433,19 +407,15 @@ AC_CACHE_VAL(glib_cv___va_copy,[
+ exit (1);
+ va_end (args1); va_end (args2);
+ }
+- int main() {
+- f (0, 42);
+- return 0;
- }],
- glib_cv___va_copy=yes
- ,
- glib_cv___va_copy=no
- ,)
-+ }])],
++ ])],
+ [glib_cv_va___copy=yes],
+ [glib_cv_va___copy=no])
])
@@ -143,22 +149,25 @@ $NetBSD: patch-cb,v 1.1 2008/01/15 22:56
#include <stdarg.h>
void f (int i, ...) {
va_list args1, args2;
-@@ -458,11 +434,9 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
- int main() {
- f (0, 42);
- return 0;
+@@ -455,14 +425,9 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
+ exit (1);
+ va_end (args1); va_end (args2);
+ }
+- int main() {
+- f (0, 42);
+- return 0;
- }],
- glib_cv_va_val_copy=yes
- ,
- glib_cv_va_val_copy=no
- ,)
-+ }])],
++ ])],
+ [glib_cv_va_val_copy=yes],
+ [glib_cv_va_val_copy=no])
])
if test "x$glib_cv_va_copy" = "xyes"; then
AC_DEFINE(G_VA_COPY, va_copy)
-@@ -893,13 +867,22 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
+@@ -893,13 +858,22 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
dnl ****************************************
dnl *** GLib POLL* compatibility defines ***
dnl ****************************************
Home |
Main Index |
Thread Index |
Old Index