|
|
@@ -10,7 +10,7 @@
|
|
|
## 'patch' tool to upgrade those files. Each patch snippet is annotated
|
|
|
## with a short description.
|
|
|
##
|
|
|
-## Created on: 29-Apr-2004
|
|
|
+## Created on: 12-May-2004
|
|
|
##
|
|
|
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
|
|
|
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
|
|
|
@@ -38,7 +38,7 @@ Index: ltconfig
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: configure.ac
|
|
|
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
-+++ configure.ac 22 Jan 2004 21:42:08 -0000 1.2
|
|
|
++++ configure.ac 11 May 2004 07:14:52 -0000
|
|
|
@@ -446,14 +447,14 @@
|
|
|
AC_CHECK_LIB(socket, socket)
|
|
|
])
|
|
|
@@ -68,7 +68,7 @@ Index: configure.ac
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: configure.ac
|
|
|
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
-+++ configure.ac 22 Jan 2004 21:42:08 -0000 1.2
|
|
|
++++ configure.ac 11 May 2004 07:14:52 -0000
|
|
|
@@ -963,12 +964,13 @@
|
|
|
AC_CHECK_FUNCS(getpassphrase)
|
|
|
|
|
|
@@ -85,6 +85,24 @@ Index: configure.ac
|
|
|
AC_CHECK_FUNC(lchown,
|
|
|
[__CHOWN_RHF="%{__chown} -Rhf"
|
|
|
|
|
|
++---------------------------------------------------------------------------
|
|
|
+| Remove RPM's "lib64" hack because we do not install
|
|
|
+| into any system locations at all.
|
|
|
++---------------------------------------------------------------------------
|
|
|
+Index: configure.ac
|
|
|
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
++++ configure.ac 11 May 2004 07:14:52 -0000
|
|
|
+@@ -1141,9 +1143,6 @@
|
|
|
+
|
|
|
+ dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
|
|
|
+ MARK64=
|
|
|
+-case "${target_cpu}" in
|
|
|
+-x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;;
|
|
|
+-esac
|
|
|
+ AC_SUBST(MARK64)
|
|
|
+
|
|
|
+ dnl Determine the canonical arch-vendor-os for the build machine
|
|
|
+
|
|
|
+---------------------------------------------------------------------------
|
|
|
| Provide fallback definitions for uintX_t stuff, which is used by
|
|
|
| build/rpmfile.h and not available on all platforms. We do this by
|
|
|
@@ -95,8 +113,8 @@ Index: configure.ac
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: configure.ac
|
|
|
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
-+++ configure.ac 22 Jan 2004 21:42:08 -0000 1.2
|
|
|
-@@ -1249,11 +1251,37 @@
|
|
|
++++ configure.ac 11 May 2004 07:14:52 -0000
|
|
|
+@@ -1249,11 +1248,37 @@
|
|
|
|
|
|
AC_SUBST(OBJDUMP)
|
|
|
|
|
|
@@ -136,6 +154,24 @@ Index: configure.ac
|
|
|
AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
|
|
|
rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
|
|
|
|
|
|
++---------------------------------------------------------------------------
|
|
|
+| Remove RPM's "lib64" hack because we do not install
|
|
|
+| into any system locations at all.
|
|
|
++---------------------------------------------------------------------------
|
|
|
+Index: popt/configure.ac
|
|
|
+--- popt/configure.ac 27 Mar 2003 17:23:18 -0000 1.1.1.3
|
|
|
++++ popt/configure.ac 12 May 2004 13:26:31 -0000
|
|
|
+@@ -53,9 +53,6 @@
|
|
|
+
|
|
|
+ dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
|
|
|
+ MARK64=
|
|
|
+-case "${target_cpu}" in
|
|
|
+-x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;;
|
|
|
+-esac
|
|
|
+ AC_SUBST(MARK64)
|
|
|
+
|
|
|
+ AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h)
|
|
|
+
|
|
|
+---------------------------------------------------------------------------
|
|
|
| Not all Bourne-Shells support embedded TAB characters in
|
|
|
| here-document style constructs. Insert the TAB character indirectly
|
