[CVS] OpenPKG: openpkg-src/openpkg openpkg.spec

[Ralf S. Engelschall]

  OpenPKG CVS Repository
  http://www.openpkg.org/cvsweb/cvsweb.cgi
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   09-Aug-2002 22:17:27
  Branch: HEAD                             Handle: 2002080921172600

  Modified files:
    openpkg-src/openpkg     openpkg.spec

  Log:
    workaround problems on Solaris 8 and make sure we die if a build fails

  Summary:
    Revision    Changes     Path
    1.89        +8  -7      openpkg-src/openpkg/openpkg.spec
  ____________________________________________________________________________

  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================
  $ cvs diff -u -r1.88 -r1.89 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  9 Aug 2002 13:12:47 -0000       1.88
  +++ openpkg-src/openpkg/openpkg.spec  9 Aug 2002 20:17:26 -0000       1.89
  @@ -356,8 +356,9 @@
         ./configure \
             --prefix=%{l_prefix} \
             --without-curses \
  +          --without-gnu-malloc \
             --disable-nls
  -      ${l_make}
  +      ${l_make} || exit $?
         (mv bash ..; ${l_make} clean || true; mv ../bash .)
       )
   
  @@ -372,7 +373,7 @@
             --config-cache \
             --prefix=%{l_prefix} \
             --disable-nls
  -      ${l_make}
  +      ${l_make} || exit $?
         (mv src/tar ..; ${l_make} clean || true; mv ../tar src/)
       )
   
  @@ -384,19 +385,19 @@
             --disable-shared \
             --disable-thread \
             --disable-ipv6
  -      ${l_make}
  +      ${l_make} || exit $?
         (mv src/curl ..; ${l_make} clean || true; mv ../curl ./src)
       )
   
       #   build BZIP2 library
       ( cd bzip2-%{V_bzip2}
  -      ${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2
  +      ${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2 || exit $?
       )
   
       #   build ZLIB library
       ( cd zlib-%{V_zlib}
         CC="${l_cc}" CFLAGS="-O" ./configure
  -      ${l_make} CC="${l_cc}" CFLAGS="-O" libz.a
  +      ${l_make} CC="${l_cc}" CFLAGS="-O" libz.a || exit $?
       )
   
       #   build Berkeley-DB library
  @@ -405,7 +406,7 @@
             *-*-osf* ) echo 'db_cv_mutex=${db_cv_mutex=UNIX/msem_init}' >config.cache 
;; # avoid dependency to pthread
         esac
         CC="${l_cc}" ../dist/configure
  -      ${l_make} libdb.a
  +      ${l_make} libdb.a || exit $?
         ln libdb.a libdbXXX.a # workaround for Tru64
       )
   
  @@ -456,7 +457,7 @@
             --with-glob \
             $nlsopt
         ${l_make} \
  -          EXTRA_LIBS="-L$br/db-%{V_db}/build_unix -ldbXXX -L$br/zlib-%{V_zlib} -lz 
-L$br/bzip2-%{V_bzip2} -lbz2" \
  +          EXTRA_LIBS="-L$br/db-%{V_db}/build_unix -ldbXXX -L$br/zlib-%{V_zlib} -lz 
-L$br/bzip2-%{V_bzip2} -lbz2"
       )
   
   %install
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]