Changeset 31834


Ignore:
Timestamp:
2017-07-28T22:08:00+12:00 (7 years ago)
Author:
ak19
Message:

Going to check if at least wget-1.15 still compiles on the 64 bit release kit linux VM, albeit with open ssl now.

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

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/build-src/packages/Makefile

    r31833 r31834  
    4040
    4141PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
    42         wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \
     42        wget/wget-1.15-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

    r31833 r31834  
    4040
    4141PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
    42         wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \
     42        wget/wget-1.15-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

    r31833 r31834  
    260260
    261261# configure wget
    262 #wget_pkgname=wget-1.15-gs
    263 wget_pkgname=wget-1.17.1-gs
     262wget_pkgname=wget-1.15-gs
     263#wget_pkgname=wget-1.17.1-gs
    264264echo ""
    265265echo "Configuring wget"
    … …  
    289289
    290290# for wget-1.15-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
    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
     291echo 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
     292cd "$PACKAGES/wget/$wget_pkgname" && \
     293CPPFLAGS="-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
     294
     295# for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
     296##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
    292297##cd "$PACKAGES/wget/$wget_pkgname" && \
    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
    294 
    295 # for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
    296 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
    297 cd "$PACKAGES/wget/$wget_pkgname" && \
    298 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
     298##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
    299299
    300300
Note: See TracChangeset for help on using the changeset viewer.