Show
Ignore:
Timestamp:
28.07.2017 20:15:40 (2 years ago)
Author:
ak19
Message:

Moved to compiling up wget-1.17.1-gs, so adding the appropriate tar.gz file besides the changes to build-src/packages' configure and Makefiles.

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

Legend:

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

    r31830 r31832  
    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 
    4444OPENSSL_PKG = openssl/openssl-1.0.2l 
  • main/trunk/greenstone2/build-src/packages/Makefile.in

    r31830 r31832  
    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 
    4444OPENSSL_PKG = openssl/openssl-1.0.2l 
  • main/trunk/greenstone2/build-src/packages/configure

    r31830 r31832  
    252252 
    253253# configure wget 
    254 wget_pkgname=wget-1.15-gs 
    255 #wget_pkgname=wget-1.17.1-gs 
     254#wget_pkgname=wget-1.15-gs 
     255wget_pkgname=wget-1.17.1-gs 
    256256echo "" 
    257257echo "Configuring wget" 
     
    281281 
    282282# 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 
     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 
     284##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 
     286 
     287# for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 
     288echo 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 
    284289cd "$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 
    286  
    287 # 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 
    289 #cd "$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 
    291  
    292 ## 
    293 ##CPPFLAGS="-I/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux/openssl/include" LDFLAGS="-L/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux/openssl/lib" ./configure --prefix=/Scratch/ak19/gs3-svn-13July2017/gs2build/build-src/packages/wget --with-ssl=openssl --bindir="/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux" -disable-nls 
    294 ## 
    295 ##make CPPFLAGS="-I/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux/openssl/include" LDFLAGS="-L/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux/openssl/lib -static" 
     290OPENSSL_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 
     291 
    296292 
    297293if test x$? = x1 ;