Changeset 31836

Timestamp:

2017-08-01T20:51:29+12:00 (6 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:

• Makefile (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• configure (modified) (2 diffs)

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

@@ -40 +40 @@
 
 PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
-        wget/wget-1.15-gs cpan/XML-Parser-2.41 \
+        wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \
         xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy
 

main/trunk/greenstone2/build-src/packages/Makefile.in

@@ -40 +40 @@
 
 PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
-        wget/wget-1.15-gs cpan/XML-Parser-2.41 \
+        wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \
         xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy
 

main/trunk/greenstone2/build-src/packages/configure

@@ -282 +282 @@
 
 # configure wget
-wget_pkgname=wget-1.15-gs
-#wget_pkgname=wget-1.17.1-gs
+#wget_pkgname=wget-1.15-gs
+wget_pkgname=wget-1.17.1-gs
 echo ""
 echo "Configuring wget"
@@ -311 +311 @@
 
 # for wget-1.15-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
-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
+##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
+##cd "$PACKAGES/wget/$wget_pkgname" && \
+##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
+
+# for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
+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
 cd "$PACKAGES/wget/$wget_pkgname" && \
-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
-
-# for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
-##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
-##cd "$PACKAGES/wget/$wget_pkgname" && \
-##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
+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