[csw-devel] SF.net SVN: gar:[21165] csw/mgar/pkg/glib2/trunk

[slowfranklin at users.sourceforge.net]

Revision: 21165
          http://gar.svn.sourceforge.net/gar/?rev=21165&view=rev
Author:   slowfranklin
Date:     2013-05-21 16:48:15 +0000 (Tue, 21 May 2013)
Log Message:
-----------
glib2/trunk: Resurrect largefile support by disabling libelf

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0021-Disable-libelf-doesn-t-work-with-large-file-support.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2013-05-21 15:32:44 UTC (rev 21164)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2013-05-21 16:48:15 UTC (rev 21165)
@@ -85,6 +85,7 @@
 PATCHFILES += 0006-Adjust-hardcoded-paths-to-match-Solaris-CSW.patch
 PATCHFILES += 0003-Make-glib-work-with-zoneinfo-version-1.patch
 PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch
+PATCHFILES += 0021-Disable-libelf-doesn-t-work-with-large-file-support.patch
 
 # What to say? Disable yet another sporadically failing up test
 PATCHFILES_isa-amd64 += 0023-disable-mainloop-invoke-test.patch
@@ -266,14 +267,6 @@
 
 BUILD64 = 1
 
-# Glib 2.32.4 won't compile and abort with a message from sys/elf.h:
-#
-#   "/usr/include/libelf.h", line 23: #error: "large files are not supported by libelf"
-#
-# so, I decided to disable-largefile support for 32bit libs, instead of patching up the code.
-CONFIGURE_ARGS-32 = --disable-largefile
-CONFIGURE_ARGS-64 =
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=gnu
 CONFIGURE_ARGS += --with-pcre=system

Added: csw/mgar/pkg/glib2/trunk/files/0021-Disable-libelf-doesn-t-work-with-large-file-support.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0021-Disable-libelf-doesn-t-work-with-large-file-support.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0021-Disable-libelf-doesn-t-work-with-large-file-support.patch	2013-05-21 16:48:15 UTC (rev 21165)
@@ -0,0 +1,37 @@
+From 27aa5d04c12dc1ae97888c077812a91f1b817da8 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Wed, 15 May 2013 15:55:58 +0200
+Subject: [PATCH] Disable libelf, doesn't work with large file support
+
+---
+ configure | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index c7338ff..92a836e 100755
+--- a/configure
++++ b/configure
+@@ -26025,17 +26025,17 @@ fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBELF_PKG_ERRORS" >&5
+ 
+-	have_libelf=maybe
++	have_libelf=no
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-	have_libelf=maybe
++	have_libelf=no
+ else
+ 	LIBELF_CFLAGS=$pkg_cv_LIBELF_CFLAGS
+ 	LIBELF_LIBS=$pkg_cv_LIBELF_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	have_libelf=yes
++	have_libelf=no
+ fi
+ 
+ if test $have_libelf = maybe; then
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.