Changeset 31833 for main

Show
Ignore:
Timestamp:
28.07.2017 21:57:40 (2 years ago)
Author:
ak19
Message:

Some minor fixes like to make setting the version of open-ssl easier. Still can't compile up wget-1.15 on Mac against openssl 1.0.2l. Same error as when compiling wget 1.15 or 1.17.1 on Ubuntu against openssl 1.1.0f. The error message in both cases is: --with-ssl=openssl was given, but SSL is not available. Next, on LSB 64 bit (releasekit machine), I need to confirm this, but I think wget 1.15 compiled successfully against openssl 1.0.2l, that is, using the early versions of both. But with the upgrade to wget 1.17.1, wget fails to compile with an error message of Unknown option: utf8. Online pages seem to indicate this has to do with a version of pod2man on the system. We don't want to change our LSB. Does this mean that we have to settle for wget 1.15? But what do we do about Mac where neither version of wget builds?

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

Legend:

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

    r31832 r31833  
    4242        wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \ 
    4343        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
     44 
    4445OPENSSL_PKG = openssl/openssl-1.0.2l 
     46#OPENSSL_PKG = openssl/openssl-1.1.0f 
    4547# When doing make clean, remove OpenSSL products too 
    4648OPENSSL_PRODUCTS = certs man misc private openssl.cnf 
  • main/trunk/greenstone2/build-src/packages/Makefile.in

    r31832 r31833  
    4242        wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \ 
    4343        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
     44 
    4445OPENSSL_PKG = openssl/openssl-1.0.2l 
     46#OPENSSL_PKG = openssl/openssl-1.1.0f 
    4547# When doing make clean, remove OpenSSL products too 
    4648OPENSSL_PRODUCTS = certs man misc private openssl.cnf 
  • main/trunk/greenstone2/build-src/packages/configure

    r31832 r31833  
    155155  gzip -dc $openssl_pkgname.tar.gz | tar -xf - 
    156156fi 
    157 cd openssl-1.0.2l 
     157cd $openssl_pkgname 
    158158 
    159159# configure 
    160160# see the INSTALL file for OpenSSL to see config options for openssl 
    161 # If you ever want to have the .a libraries that building openssl generates, 
    162 # then use the --prefix and point it to the $bindir. 
    163161# --prefix indicates where the generated lib, include and bin folders will go 
    164162# --openssldir will contain the manuals and other non-essentials 
    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 
    167 echo ./config --openssldir=$PACKAGES/openssl no-shared 
    168 ./config --openssldir=$PACKAGES/openssl no-shared 
     163# BEWARE: The defaults for --prefix and meaning of --openssldir differ between 
     164# versions of openssl. In the earlier version (1.0.* like 1.0.2l), if 
     165# --prefix is not supplied then the generated lib, include and bin folders 
     166# will also go into --openssldir. 
     167# In the newer version 1.1.* 1.1.0f, if --prefix is not supplied, it will 
     168# try to install the generated lib, include and bin folders into a system place. 
     169# So better to provide both --opennssldir and --prefix, for both openssl versions 
     170# to compile succesfully. 
     171# If you ever want to have the .a libraries that building openssl generates, 
     172# then point the --prefix to the $bindir. We currently don't need to put them 
     173# into $bindir/openssl for wget to use, since wget is built against openssl's 
     174# static libraries and therefore wget doesn't need these when running. 
     175echo ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared 
     176./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared 
    169177# make 
    170178echo make 
     
    281289 
    282290# for wget-1.15-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 
    283 ##echo 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 
     291##echo 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 
    284292##cd "$PACKAGES/wget/$wget_pkgname" && \ 
    285 ##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_extraargs 
     293##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_extraargs 
    286294 
    287295# for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 
    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 
     296echo 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 
    289297cd "$PACKAGES/wget/$wget_pkgname" && \ 
    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 
     298OPENSSL_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 
    291299 
    292300