소스 검색

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

Ralf S. Engelschall 23 년 전
부모
커밋
3e008e9d52
1개의 변경된 파일8개의 추가작업 그리고 7개의 파일을 삭제
  1. 8 7
      openpkg/openpkg.spec

+ 8 - 7
openpkg/openpkg.spec

@@ -356,8 +356,9 @@ Provides:     OpenPKG
       ./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 @@ Provides:     OpenPKG
           --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 @@ Provides:     OpenPKG
           --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 @@ Provides:     OpenPKG
           *-*-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 @@ Provides:     OpenPKG
           --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