- sparc-sun-solaris2.6 portability check.

CVS patchset: 3589
CVS date: 2000/02/25 16:49:05

diff --git a/CHANGES b/CHANGES
index 7d3be74..9ed057a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -61,6 +61,7 @@
        - add i18n lookaside to PO catalogue(s) for i18n strings.
        - try for /etc/rpm/macros.specspo so that specspo autoconfigures rpm.
        - per-platform configuration factored into /usr/lib/rpm subdir.
+       - sparc-sun-solaris2.6 portability check.
 
 3.0.2 -> 3.0.3
        - add --eval to find result of macro expansion.

diff --git a/Makefile.am b/Makefile.am
index 87e3673..4bafe66 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,13 @@ INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
        @INCPATH@
 
 myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
-# XXX libtool generates dependent libs.
-myldadd= $(top_builddir)/build/librpmbuild.la \
+
+# XXX libtool can/should generate dependent libs.
+# XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
+myldadd= \
+       $(top_builddir)/build/.libs/librpmbuild.a \
+       $(top_builddir)/lib/.libs/librpm.a \
+       $(top_builddir)/popt/.libs/libpopt.a \
        @INTLLIBS@ @LIBMISC@
 
 LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)

diff --git a/aclocal.m4 b/aclocal.m4
index 56e7a82..d59e8cb 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -21,6 +21,8 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 02baf9f..1df4f2c 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -8,11 +8,11 @@ WriteMakefile(
              'OBJECT'  => 'rpm.o constant.o',
              'VERSION_FROM' => 'rpm.pm',               # finds $VERSION
              'MAKEFILE'=> 'PMakefile',
-             'LIBS'    => [' -L/usr/local/lib  -ldb1 -lz -lbz2'],                      # e.g., '-lm' 
+             'LIBS'    => [' -L/usr/local/lib -R/usr/local/lib  -L/usr/ucblib -R/usr/ucblib  -lnsl -lsocket -ldb -lz -lbz2'],                  # e.g., '-lm' 
              'CCFLAGS' => '-g -O2 -D_GNU_SOURCE -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts',
              'OPTIMIZE'=> '-g',
              'DEFINE'  => '-Dbool=char -DHAS_BOOL',
-             'INC'     => ' -I../build -I../lib -I../popt -I/usr/include/rpm',
+             'INC'     => ' -I/usr/local/include -I$(top_builddir)/misc -I../build -I../lib -I../popt -I/usr/include/rpm',
              'depend'  => { 'rpm.c' => 'transaction.xs header.xs db.xs' },
 );
 

diff --git a/perl/Makefile.in b/perl/Makefile.in
index f4cc7f2..9bb5ea4 100644 (file)
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,9 +48,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -171,7 +172,7 @@ DIST_COMMON =  README ChangeLog Makefile.PL.in Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -220,7 +221,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$/$$file $(distdir)/$$file; \
+           cp -pr $$d/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -249,7 +250,7 @@ uninstall: uninstall-am
 all-am: Makefile $(SCRIPTS)
 all-redirect: all-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
        $(mkinstalldirs)  $(DESTDIR)$(configdir)
 

diff --git a/python/Makefile.in b/python/Makefile.in
index 12f9aef..083ee4c 100644 (file)
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,9 +48,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -196,7 +197,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 DEP_FILES =  .deps/hash.P .deps/rpmmodule.P .deps/upgrade.P
 SOURCES = $(librpmmodule_la_SOURCES) $(rpmmodule_so_SOURCES)
@@ -271,8 +272,8 @@ install-pythonPROGRAMS: $(python_PROGRAMS)
        $(mkinstalldirs) $(DESTDIR)$(pythondir)
        @list='$(python_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+           echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
@@ -324,7 +325,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$/$$file $(distdir)/$$file; \
+           cp -pr $$d/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -385,7 +386,7 @@ uninstall: uninstall-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
 all-redirect: all-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
        $(mkinstalldirs)  $(DESTDIR)$(pythondir)
 

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 4c3166d..2aabf18 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,9 +48,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -171,7 +172,7 @@ DIST_COMMON =  Makefile.am Makefile.in brp-redhat.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -220,7 +221,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$/$$file $(distdir)/$$file; \
+           cp -pr $$d/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -249,7 +250,7 @@ uninstall: uninstall-am
 all-am: Makefile $(SCRIPTS)
 all-redirect: all-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
        $(mkinstalldirs)  $(DESTDIR)$(configdir)
 

diff --git a/scripts/vpkg-provides.sh b/scripts/vpkg-provides.sh
index 1ca58dc..0acc56e 100755 (executable)
--- a/scripts/vpkg-provides.sh
+++ b/scripts/vpkg-provides.sh
@@ -182,6 +182,8 @@ do
                echo "$0: Unrecognized option: \"$orig_option\"; use --help for usage." >&2
                exit 1
                ;;
+       esac
+done
 
 
 # consistancy checks on the arguments
@@ -247,23 +249,25 @@ cat $spec_header
 #
 # Output the shared libraries
 #
-for f in `cat $provides_tmp | sort -u`
-do
+{
+    for f in `cat $provides_tmp | sort -u`
+    do
        echo "Provides: $f"
-done
+    done
 
 #
 # Output the available shell interpreters
 #
-for d in `echo $interp_dirs | sed -e 's/:/ /g'`
-do
+    for d in `echo $interp_dirs | sed -e 's/:/ /g'`
+    do
        for f in `echo $interps | sed -e 's/:/ /g'`
        do
                if test -f $d/$f ; then
                        echo "Provides: $d/$f"
                fi
        done
-done
+    done
+} | sed -e 's/%/%%/g'
 
 #
 # Output the discription of the spec file
@@ -330,7 +334,7 @@ _EIEIO_
 # the contents of the temporary file are hardcoded into the verify
 # script so that the file can be reproduced at verification time.
 
-cat $sum_tmp
+cat $sum_tmp | sed -e 's/%/%%/g'
 
 cat <<_EIEIO_
 _EOF_
@@ -339,7 +343,7 @@ _EOF_
 cmp \$sum_package_tmp \$sum_current_tmp 
 
 if [ $? -ne 0 ]; then
-       echo"Differences found by: cmp \$sum_package_tmp \$sum_current_tmp"
+       echo "Differences found by: cmp \$sum_package_tmp \$sum_current_tmp"
        exit \$?
 fi
 
@@ -350,3 +354,4 @@ _EIEIO_
 #
 
 echo '%files'
+echo '# no files in a virtual package'