Changeset 31836 for main

Show
Ignore:
Timestamp:
01.08.2017 20:51:29 (2 years ago)
Author:
ak19
Message:

Wget-1.17.1-gs compiles up successfully on Macs too. Still need to get it to work in the LSB environment, but will try to fix up that next.

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

Legend:

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

    r31834 r31836  
    4040 
    4141PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 
    42         wget/wget-1.15-gs cpan/XML-Parser-2.41 \ 
     42        wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \ 
    4343        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
    4444 
  • main/trunk/greenstone2/build-src/packages/Makefile.in

    r31834 r31836  
    4040 
    4141PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 
    42         wget/wget-1.15-gs cpan/XML-Parser-2.41 \ 
     42        wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \ 
    4343        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
    4444 
  • main/trunk/greenstone2/build-src/packages/configure

    r31835 r31836  
    282282 
    283283# configure wget 
    284 wget_pkgname=wget-1.15-gs 
    285 #wget_pkgname=wget-1.17.1-gs 
     284#wget_pkgname=wget-1.15-gs 
     285wget_pkgname=wget-1.17.1-gs 
    286286echo "" 
    287287echo "Configuring wget" 
     
    311311 
    312312# for wget-1.15-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 
    313 echo CPPFLAGS="-I$PACKAGES/openssl/include $CPPFLAGS" LDFLAGS="-L$PACKAGES/openssl/lib $LDFLAGS" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraarg 
     313##echo CPPFLAGS="-I$PACKAGES/openssl/include $CPPFLAGS" LDFLAGS="-L$PACKAGES/openssl/lib $LDFLAGS" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraarg 
     314##cd "$PACKAGES/wget/$wget_pkgname" && \ 
     315##CPPFLAGS="-I$PACKAGES/openssl/include $CPPFLAGS" LDFLAGS="-L$PACKAGES/openssl/lib $LDFLAGS" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
     316 
     317# for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 
     318echo 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 
    314319cd "$PACKAGES/wget/$wget_pkgname" && \ 
    315 CPPFLAGS="-I$PACKAGES/openssl/include $CPPFLAGS" LDFLAGS="-L$PACKAGES/openssl/lib $LDFLAGS" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
    316  
    317 # for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 
    318 ##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 
    319 ##cd "$PACKAGES/wget/$wget_pkgname" && \ 
    320 ##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 
     320OPENSSL_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 
    321321 
    322322