Changeset 31832 for main/trunk/greenstone2
- Timestamp:
- 2017-07-28T20:15:40+12:00 (7 years ago)
- Location:
- main/trunk/greenstone2/build-src/packages
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/build-src/packages/Makefile
r31830 r31832 40 40 41 41 PACKAGEDIRS += rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 42 wget/wget-1.1 5-gs cpan/XML-Parser-2.41 \42 wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \ 43 43 xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 44 44 OPENSSL_PKG = openssl/openssl-1.0.2l -
main/trunk/greenstone2/build-src/packages/Makefile.in
r31830 r31832 40 40 41 41 PACKAGEDIRS += rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 42 wget/wget-1.1 5-gs cpan/XML-Parser-2.41 \42 wget/wget-1.17.1-gs cpan/XML-Parser-2.41 \ 43 43 xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 44 44 OPENSSL_PKG = openssl/openssl-1.0.2l -
main/trunk/greenstone2/build-src/packages/configure
r31830 r31832 252 252 253 253 # configure wget 254 wget_pkgname=wget-1.15-gs255 #wget_pkgname=wget-1.17.1-gs254 #wget_pkgname=wget-1.15-gs 255 wget_pkgname=wget-1.17.1-gs 256 256 echo "" 257 257 echo "Configuring wget" … … 281 281 282 282 # 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) 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 284 289 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) 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" 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 296 292 297 293 if test x$? = x1 ;
Note:
See TracChangeset
for help on using the changeset viewer.