Changeset 31830 for main

Show
Ignore:
Timestamp:
28.07.2017 19:26:50 (2 years ago)
Author:
ak19
Message:

Next working incremental commit. Wget doesn't need openssl libraries to run, since wget is built against statically-compiled up openssl. So openssl doesn't need to live in gs2build/bin/linux, but can be built in build-src/packages/openssl where it's extracted and compiled and needn't be included in the library.

Location:
main/trunk/greenstone2/build-src/packages
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/packages/Makefile

    r31829 r31830  
    4343        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
    4444OPENSSL_PKG = openssl/openssl-1.0.2l 
     45# When doing make clean, remove OpenSSL products too 
     46OPENSSL_PRODUCTS = certs man misc private openssl.cnf 
     47# The key OpenSSL products bin, include, lib folders no longer live in 
     48# gs2build/bin/linux, but in the same location as the rest, so add that: 
     49OPENSSL_PRODUCTS += bin include lib 
    4550 
    4651all: 
     
    6772          (cd $$subdir && $(MAKE) distclean || exit 0) ; \ 
    6873        done 
    69     (cd openssl && rm -rf certs man misc private openssl.cnf || exit 0) 
     74    (cd openssl && rm -rf $(OPENSSL_PRODUCTS) || exit 0) 
    7075    rm -rf $(OPENSSL_PKG) 
  • main/trunk/greenstone2/build-src/packages/Makefile.in

    r31829 r31830  
    4343        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
    4444OPENSSL_PKG = openssl/openssl-1.0.2l 
     45# When doing make clean, remove OpenSSL products too 
     46OPENSSL_PRODUCTS = certs man misc private openssl.cnf 
     47# The key OpenSSL products bin, include, lib folders no longer live in 
     48# gs2build/bin/linux, but in the same location as the rest, so add that: 
     49OPENSSL_PRODUCTS += bin include lib 
    4550 
    4651all: 
     
    6772          (cd $$subdir && $(MAKE) distclean || exit 0) ; \ 
    6873        done 
    69     (cd openssl && rm -rf certs man misc private openssl.cnf || exit 0) 
     74    (cd openssl && rm -rf $(OPENSSL_PRODUCTS) || exit 0) 
    7075    rm -rf $(OPENSSL_PKG) 
  • main/trunk/greenstone2/build-src/packages/configure

    r31829 r31830  
    163163# --prefix indicates where the generated lib, include and bin folders will go 
    164164# --openssldir will contain the manuals and other non-essentials 
    165 # we'll put them into $bindir/openssl for wget to use 
    166 echo ./config --prefix=$bindir/openssl --openssldir=$PACKAGES/openssl no-shared 
    167 ./config --prefix=$bindir/openssl --openssldir=$PACKAGES/openssl no-shared 
     165# We don't need to put them into $bindir/openssl for wget to use, since wget is built 
     166# against openssl's static libraries and therefore wget doesn't need these when running 
     167echo ./config --openssldir=$PACKAGES/openssl no-shared 
     168./config --openssldir=$PACKAGES/openssl no-shared 
    168169# make 
    169170echo make 
     
    280281 
    281282# for wget-1.15-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 
    282 echo CPPFLAGS="-I/$bindir/openssl/include" LDFLAGS="-L/$bindir/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraarg 
     283echo CPPFLAGS="-I/$PACKAGES/openssl/include" LDFLAGS="-L/$PACKAGES/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraarg 
    283284cd "$PACKAGES/wget/$wget_pkgname" && \ 
    284 CPPFLAGS="-I/$bindir/openssl/include" LDFLAGS="-L/$bindir/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
     285CPPFLAGS="-I/$PACKAGES/openssl/include" LDFLAGS="-L/$PACKAGES/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
    285286 
    286287# for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 
    287 #echo OPENSSL_CFLAGS="-I/$bindir/openssl/include" OPENSSL_LIBS="-L/$bindir/openssl/lib -lssl -lcrypto" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --with-openssl=auto --with-libssl-prefix="$bindir/openssl" --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
     288#echo OPENSSL_CFLAGS="-I/$PACKAGES/openssl/include" OPENSSL_LIBS="-L/$PACKAGES/openssl/lib -lssl -lcrypto" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --with-openssl=auto --with-libssl-prefix="$PACKAGES/openssl" --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
    288289#cd "$PACKAGES/wget/$wget_pkgname" && \ 
    289 #OPENSSL_CFLAGS="-I/$bindir/openssl/include" OPENSSL_LIBS="-L/$bindir/openssl/lib -lssl -lcrypto" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --with-openssl=auto --with-libssl-prefix="$bindir/openssl" --bindir="$bindir"  -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
     290#OPENSSL_CFLAGS="-I/$PACKAGES/openssl/include" OPENSSL_LIBS="-L/$PACKAGES/openssl/lib -lssl -lcrypto" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --with-openssl=auto --with-libssl-prefix="$PACKAGES/openssl" --bindir="$bindir"  -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
    290291 
    291292##