Changeset 31830 for main/trunk/greenstone2
- Timestamp:
- 2017-07-28T19:26:50+12:00 (7 years ago)
- Location:
- main/trunk/greenstone2/build-src/packages
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/build-src/packages/Makefile
r31829 r31830 43 43 xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 44 44 OPENSSL_PKG = openssl/openssl-1.0.2l 45 # When doing make clean, remove OpenSSL products too 46 OPENSSL_PRODUCTS = certs man misc private openssl.cnf 47 # The key OpenSSL products bin, include, lib folders no longer live in 48 # gs2build/bin/linux, but in the same location as the rest, so add that: 49 OPENSSL_PRODUCTS += bin include lib 45 50 46 51 all: … … 67 72 (cd $$subdir && $(MAKE) distclean || exit 0) ; \ 68 73 done 69 (cd openssl && rm -rf certs man misc private openssl.cnf|| exit 0)74 (cd openssl && rm -rf $(OPENSSL_PRODUCTS) || exit 0) 70 75 rm -rf $(OPENSSL_PKG) -
main/trunk/greenstone2/build-src/packages/Makefile.in
r31829 r31830 43 43 xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 44 44 OPENSSL_PKG = openssl/openssl-1.0.2l 45 # When doing make clean, remove OpenSSL products too 46 OPENSSL_PRODUCTS = certs man misc private openssl.cnf 47 # The key OpenSSL products bin, include, lib folders no longer live in 48 # gs2build/bin/linux, but in the same location as the rest, so add that: 49 OPENSSL_PRODUCTS += bin include lib 45 50 46 51 all: … … 67 72 (cd $$subdir && $(MAKE) distclean || exit 0) ; \ 68 73 done 69 (cd openssl && rm -rf certs man misc private openssl.cnf|| exit 0)74 (cd openssl && rm -rf $(OPENSSL_PRODUCTS) || exit 0) 70 75 rm -rf $(OPENSSL_PKG) -
main/trunk/greenstone2/build-src/packages/configure
r31829 r31830 163 163 # --prefix indicates where the generated lib, include and bin folders will go 164 164 # --openssldir will contain the manuals and other non-essentials 165 # we'll put them into $bindir/openssl for wget to use 166 echo ./config --prefix=$bindir/openssl --openssldir=$PACKAGES/openssl no-shared 167 ./config --prefix=$bindir/openssl --openssldir=$PACKAGES/openssl no-shared 165 # We don't need to put them into $bindir/openssl for wget to use, since wget is built 166 # against openssl's static libraries and therefore wget doesn't need these when running 167 echo ./config --openssldir=$PACKAGES/openssl no-shared 168 ./config --openssldir=$PACKAGES/openssl no-shared 168 169 # make 169 170 echo make … … 280 281 281 282 # for wget-1.15-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 282 echo CPPFLAGS="-I/$ bindir/openssl/include" LDFLAGS="-L/$bindir/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraarg283 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 284 cd "$PACKAGES/wget/$wget_pkgname" && \ 284 CPPFLAGS="-I/$ bindir/openssl/include" LDFLAGS="-L/$bindir/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs285 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 285 286 286 287 # for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri) 287 #echo OPENSSL_CFLAGS="-I/$ bindir/openssl/include" OPENSSL_LIBS="-L/$bindir/openssl/lib -lssl -lcrypto" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --with-openssl=auto --with-libssl-prefix="$bindir/openssl" --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs288 #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 288 289 #cd "$PACKAGES/wget/$wget_pkgname" && \ 289 #OPENSSL_CFLAGS="-I/$ bindir/openssl/include" OPENSSL_LIBS="-L/$bindir/openssl/lib -lssl -lcrypto" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --with-openssl=auto --with-libssl-prefix="$bindir/openssl" --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs290 #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 290 291 291 292 ##
Note:
See TracChangeset
for help on using the changeset viewer.