OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Sep-2003 11:38:22
Branch: HEAD Handle: 2003090110382100
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
port RPM 4.2.1 to Solaris 2.6 (no uintX_t) and non-GCC platforms (no
inline)
Summary:
Revision Changes Path
1.36 +1 -0 openpkg-src/openpkg/HISTORY
1.12 +2 -2 openpkg-src/openpkg/rpm.patch.bugfix
1.12 +2 -2 openpkg-src/openpkg/rpm.patch.feature
1.16 +75 -1 openpkg-src/openpkg/rpm.patch.porting
1.11 +136 -3 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.35 -r1.36 HISTORY
--- openpkg-src/openpkg/HISTORY 1 Sep 2003 07:03:47 -0000 1.35
+++ openpkg-src/openpkg/HISTORY 1 Sep 2003 09:38:21 -0000 1.36
@@ -2,6 +2,7 @@
2003
====
+20030901 port RPM 4.2.1 to Solaris 2.6 (no "uintX_t") and non-GCC platforms (no
"inline")
20030901 port RPM 4.2.1 to OpenBSD/NetBSD, too.
20030830 replace Bash variable exporting constructs with compatible Bourne-Shell
constructs
20030828 fix unpacking of non-compressed tarballs
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.11 -r1.12 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 1 Sep 2003 07:03:47 -0000 1.11
+++ openpkg-src/openpkg/rpm.patch.bugfix 1 Sep 2003 09:38:21 -0000 1.12
@@ -51,8 +51,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 26 Aug 2003 08:06:43 -0000
-@@ -1274,7 +1276,6 @@
++++ configure.ac 1 Sep 2003 09:26:45 -0000
+@@ -1274,7 +1298,6 @@
python/rpmdb/Makefile
python/test/Makefile
], [ echo timestamp > popt/stamp-h.in
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.11 -r1.12 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 1 Sep 2003 07:22:06 -0000 1.11
+++ openpkg-src/openpkg/rpm.patch.feature 1 Sep 2003 09:38:21 -0000 1.12
@@ -602,7 +602,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 26 Aug 2003 08:06:43 -0000
++++ configure.ac 1 Sep 2003 09:26:45 -0000
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
@@ -635,7 +635,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 26 Aug 2003 08:06:43 -0000
++++ configure.ac 1 Sep 2003 09:26:45 -0000
@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.15 -r1.16 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 1 Sep 2003 07:22:06 -0000 1.15
+++ openpkg-src/openpkg/rpm.patch.porting 1 Sep 2003 09:38:21 -0000 1.16
@@ -21,7 +21,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 26 Aug 2003 08:06:43 -0000
++++ configure.ac 1 Sep 2003 09:26:45 -0000
@@ -963,12 +964,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -39,6 +39,45 @@
[__CHOWN_RHF="%{__chown} -Rhf"
+---------------------------------------------------------------------------
+| Provide fallback definitions for uintX_t stuff, which is used by
+| build/rpmfile.h and not available on all platforms. We do this by
+| adding the same Autoconf checks file/configure already used for its
+| original file.h.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 1 Sep 2003 09:26:45 -0000
+@@ -1253,6 +1255,28 @@
+ dnl # XXX Propagate -lucb to popt ...
+ dnl export LIBS INCPATH CONFIG_SITE
+
++dnl OpenPKG: rpmfile.h (used in RPM) from file(1) needs additional checks
++dnl for its use of uintXX_t (which are available in file/config.h, but which
++dnl we cannot include into RPM because of conflicts with RPM's config.h)
++AC_DEFUN([AC_CHECK_TYPE_STDC],
++[AC_REQUIRE([AC_HEADER_STDC])dnl
++AC_MSG_CHECKING(for $1)
++AC_CACHE_VAL(ac_cv_type_$1,
++[AC_EGREP_CPP(dnl
++[(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]],
++[#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
++AC_MSG_RESULT($ac_cv_type_$1)
++if test $ac_cv_type_$1 = no; then
++ AC_DEFINE($1, $2, $1)
++fi])
++AC_CHECK_TYPE_STDC(uint8_t, unsigned char)
++AC_CHECK_TYPE_STDC(uint16_t, unsigned short)
++AC_CHECK_TYPE_STDC(uint32_t, unsigned int)
++
+ AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
+
+ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
+
++---------------------------------------------------------------------------
| Not all Bourne-Shells support embedded TAB characters in
| here-document style constructs. Insert the TAB character indirectly
| to workaround problems. Additionally, there is no need to build a
@@ -173,6 +212,41 @@
staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
+
++---------------------------------------------------------------------------
+| Drop GCC "inline" attribute if not compiling with GCC.
++---------------------------------------------------------------------------
+Index: file/system.h
+--- file/system.h 24 Jan 2003 19:41:56 -0000 1.1.1.1
++++ file/system.h 1 Sep 2003 08:59:40 -0000
+@@ -246,7 +246,11 @@
+ */
+ /[EMAIL PROTECTED]@*/
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
++#if defined(__GNUC__)
+ static inline void * vmefail(/[EMAIL PROTECTED]@*/ size_t nb)
++#else
++static void * vmefail(/[EMAIL PROTECTED]@*/ size_t nb)
++#endif
+ /[EMAIL PROTECTED] fileSystem @*/
+ /[EMAIL PROTECTED] fileSystem @*/
+ {
+@@ -314,9 +318,14 @@
+
+ #if defined(__LCLINT__)
+ #define FILE_RCSID(id)
+-#else
++#elif defined(__GNUC__)
+ #define FILE_RCSID(id) \
+ static inline const char *rcsid(const char *p) { \
++ return rcsid(p = id); \
++}
++#else
++#define FILE_RCSID(id) \
++static const char *rcsid(const char *p) { \
+ return rcsid(p = id); \
+ }
+ #endif
+---------------------------------------------------------------------------
| Use GNU libtool's weaker -static (link with own static libraries)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.10 -r1.11 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 1 Sep 2003 07:03:47 -0000 1.10
+++ openpkg-src/openpkg/rpm.patch.regen 1 Sep 2003 09:38:21 -0000 1.11
@@ -22,7 +22,7 @@
+---------------------------------------------------------------------------
Index: config.h.in
--- config.h.in 16 Jul 2003 17:17:13 -0000 1.1.1.18
-+++ config.h.in 24 Aug 2003 18:58:58 -0000
++++ config.h.in 1 Sep 2003 09:26:57 -0000
@@ -108,6 +108,9 @@
/* Define if you have the getmntent() function */
#undef HAVE_GETMNTENT
@@ -33,6 +33,22 @@
/* Define as 1 if you have getmntinfo_r() (only osf?) */
#undef HAVE_GETMNTINFO_R
+@@ -585,6 +588,15 @@
+
+ /* Define to `unsigned' if <sys/types.h> does not define. */
+ #undef size_t
++
++/* uint16_t */
++#undef uint16_t
++
++/* uint32_t */
++#undef uint32_t
++
++/* uint8_t */
++#undef uint8_t
+
+ /* Define to unsigned long or unsigned long long if <inttypes.h> and
+ <stdint.h> don't define. */
+---------------------------------------------------------------------------
| Corresponding patches in "configure" script after regeneration from
@@ -40,7 +56,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 26 Aug 2003 08:22:10 -0000
++++ configure 1 Sep 2003 09:26:56 -0000
@@ -4040,7 +4040,7 @@
AS=${AS-as}
@@ -253,7 +269,124 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -25157,7 +25240,6 @@
+@@ -23589,6 +23672,116 @@
+
+
+
++echo "$as_me:$LINENO: checking for uint8_t" >&5
++echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
++if test "${ac_cv_type_uint8_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "(^|[^a-zA-Z_0-9])uint8_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++ ac_cv_type_uint8_t=yes
++else
++ ac_cv_type_uint8_t=no
++fi
++rm -f conftest*
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
++if test $ac_cv_type_uint8_t = no; then
++
++cat >>confdefs.h <<\_ACEOF
++#define uint8_t unsigned char
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: checking for uint16_t" >&5
++echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
++if test "${ac_cv_type_uint16_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "(^|[^a-zA-Z_0-9])uint16_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++ ac_cv_type_uint16_t=yes
++else
++ ac_cv_type_uint16_t=no
++fi
++rm -f conftest*
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
++if test $ac_cv_type_uint16_t = no; then
++
++cat >>confdefs.h <<\_ACEOF
++#define uint16_t unsigned short
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: checking for uint32_t" >&5
++echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
++if test "${ac_cv_type_uint32_t+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "(^|[^a-zA-Z_0-9])uint32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++ ac_cv_type_uint32_t=yes
++else
++ ac_cv_type_uint32_t=no
++fi
++rm -f conftest*
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
++if test $ac_cv_type_uint32_t = no; then
++
++cat >>confdefs.h <<\_ACEOF
++#define uint32_t unsigned int
++_ACEOF
++
++fi
++
++
+
+ subdirs="$subdirs popt beecrypt zlib elfutils file db3"
+
+@@ -25157,7 +25350,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
