This commit is contained in:
parent
da8797d980
commit
3aacdb8027
98
gnulib.diff
Normal file
98
gnulib.diff
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
--- m4/extensions.m4
|
||||||
|
+++ m4/extensions.m4
|
||||||
|
@@ -1,14 +1,14 @@
|
||||||
|
-# serial 4 -*- Autoconf -*-
|
||||||
|
+# serial 5 -*- Autoconf -*-
|
||||||
|
# Enable extensions on systems that normally disable them.
|
||||||
|
|
||||||
|
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
|
||||||
|
+# Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc.
|
||||||
|
# This file is free software; the Free Software Foundation
|
||||||
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
|
||||||
|
# Autoconf. Perhaps we can remove this once we can assume Autoconf
|
||||||
|
-# 2.61 or later everywhere, but since CVS Autoconf mutates rapidly
|
||||||
|
+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
|
||||||
|
# enough in this area it's likely we'll need to redefine
|
||||||
|
# AC_USE_SYSTEM_EXTENSIONS for quite some time.
|
||||||
|
|
||||||
|
@@ -16,39 +16,63 @@
|
||||||
|
# ------------------------
|
||||||
|
# Enable extensions on systems that normally disable them,
|
||||||
|
# typically due to standards-conformance issues.
|
||||||
|
+# Remember that #undef in AH_VERBATIM gets replaced with #define by
|
||||||
|
+# AC_DEFINE. The goal here is to define all known feature-enabling
|
||||||
|
+# macros, then, if reports of conflicts are made, disable macros that
|
||||||
|
+# cause problems on some platforms (such as __EXTENSIONS__).
|
||||||
|
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
|
||||||
|
-[
|
||||||
|
- AC_BEFORE([$0], [AC_COMPILE_IFELSE])
|
||||||
|
- AC_BEFORE([$0], [AC_RUN_IFELSE])
|
||||||
|
-
|
||||||
|
- AC_REQUIRE([AC_GNU_SOURCE])
|
||||||
|
- AC_REQUIRE([AC_AIX])
|
||||||
|
- AC_REQUIRE([AC_MINIX])
|
||||||
|
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
|
||||||
|
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
|
||||||
|
+
|
||||||
|
+ AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
|
||||||
|
+ if test "$MINIX" = yes; then
|
||||||
|
+ AC_DEFINE([_POSIX_SOURCE], [1],
|
||||||
|
+ [Define to 1 if you need to in order for `stat' and other
|
||||||
|
+ things to work.])
|
||||||
|
+ AC_DEFINE([_POSIX_1_SOURCE], [2],
|
||||||
|
+ [Define to 2 if the system does not provide POSIX.1 features
|
||||||
|
+ except with this defined.])
|
||||||
|
+ AC_DEFINE([_MINIX], [1],
|
||||||
|
+ [Define to 1 if on MINIX.])
|
||||||
|
+ fi
|
||||||
|
|
||||||
|
AH_VERBATIM([__EXTENSIONS__],
|
||||||
|
-[/* Enable extensions on Solaris. */
|
||||||
|
-#ifndef __EXTENSIONS__
|
||||||
|
-# undef __EXTENSIONS__
|
||||||
|
+[/* Enable extensions on AIX 3, Interix. */
|
||||||
|
+#ifndef _ALL_SOURCE
|
||||||
|
+# undef _ALL_SOURCE
|
||||||
|
#endif
|
||||||
|
+/* Enable GNU extensions on systems that have them. */
|
||||||
|
+#ifndef _GNU_SOURCE
|
||||||
|
+# undef _GNU_SOURCE
|
||||||
|
+#endif
|
||||||
|
+/* Enable threading extensions on Solaris. */
|
||||||
|
#ifndef _POSIX_PTHREAD_SEMANTICS
|
||||||
|
# undef _POSIX_PTHREAD_SEMANTICS
|
||||||
|
#endif
|
||||||
|
+/* Enable extensions on HP NonStop. */
|
||||||
|
#ifndef _TANDEM_SOURCE
|
||||||
|
# undef _TANDEM_SOURCE
|
||||||
|
-#endif])
|
||||||
|
+#endif
|
||||||
|
+/* Enable general extensions on Solaris. */
|
||||||
|
+#ifndef __EXTENSIONS__
|
||||||
|
+# undef __EXTENSIONS__
|
||||||
|
+#endif
|
||||||
|
+])
|
||||||
|
AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
|
||||||
|
[ac_cv_safe_to_define___extensions__],
|
||||||
|
[AC_COMPILE_IFELSE(
|
||||||
|
- [AC_LANG_PROGRAM([
|
||||||
|
+ [AC_LANG_PROGRAM([[
|
||||||
|
# define __EXTENSIONS__ 1
|
||||||
|
- AC_INCLUDES_DEFAULT])],
|
||||||
|
+ ]AC_INCLUDES_DEFAULT])],
|
||||||
|
[ac_cv_safe_to_define___extensions__=yes],
|
||||||
|
[ac_cv_safe_to_define___extensions__=no])])
|
||||||
|
test $ac_cv_safe_to_define___extensions__ = yes &&
|
||||||
|
AC_DEFINE([__EXTENSIONS__])
|
||||||
|
+ AC_DEFINE([_ALL_SOURCE])
|
||||||
|
+ AC_DEFINE([_GNU_SOURCE])
|
||||||
|
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
|
||||||
|
AC_DEFINE([_TANDEM_SOURCE])
|
||||||
|
-])
|
||||||
|
+])# AC_USE_SYSTEM_EXTENSIONS
|
||||||
|
|
||||||
|
# gl_USE_SYSTEM_EXTENSIONS
|
||||||
|
# ------------------------
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 9 17:19:58 CEST 2008 - schwab@suse.de
|
||||||
|
|
||||||
|
- Fix gnulib macro and use autoreconf.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
|
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ License: GPL v2 or later
|
|||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
Summary: GNU partitioner
|
Summary: GNU partitioner
|
||||||
Version: 1.8.8
|
Version: 1.8.8
|
||||||
Release: 35
|
Release: 42
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Patch: always-resize-part.dif
|
Patch: always-resize-part.dif
|
||||||
Patch1: parted-type.patch
|
Patch1: parted-type.patch
|
||||||
@ -31,6 +31,7 @@ Patch8: fat16_hfs_fix.dif
|
|||||||
Patch9: always_print_geom.diff
|
Patch9: always_print_geom.diff
|
||||||
Patch10: 2TB_size_overflow.diff
|
Patch10: 2TB_size_overflow.diff
|
||||||
Patch11: fix-function-def.patch
|
Patch11: fix-function-def.patch
|
||||||
|
Patch12: gnulib.diff
|
||||||
Patch51: parted.tty.patch
|
Patch51: parted.tty.patch
|
||||||
Patch52: parted.no-O_DIRECT.patch
|
Patch52: parted.no-O_DIRECT.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -81,12 +82,12 @@ Authors:
|
|||||||
%patch9
|
%patch9
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch11
|
%patch11
|
||||||
|
%patch12
|
||||||
%patch51 -p1
|
%patch51 -p1
|
||||||
%patch52 -p1
|
%patch52 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#autoreconf --force --install
|
AUTOPOINT=true autoreconf --force --install
|
||||||
test -f po/Makevars || mv po/Makevars.template po/Makevars
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS" \
|
CFLAGS="$RPM_OPT_FLAGS" \
|
||||||
%configure \
|
%configure \
|
||||||
--enable-device-mapper=yes \
|
--enable-device-mapper=yes \
|
||||||
@ -127,6 +128,8 @@ rm -rf "$RPM_BUILD_ROOT"
|
|||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 09 2008 schwab@suse.de
|
||||||
|
- Fix gnulib macro and use autoreconf.
|
||||||
* Thu Apr 10 2008 ro@suse.de
|
* Thu Apr 10 2008 ro@suse.de
|
||||||
- added baselibs.conf file to build xxbit packages
|
- added baselibs.conf file to build xxbit packages
|
||||||
for multilib support
|
for multilib support
|
||||||
|
Loading…
Reference in New Issue
Block a user