- Timestamp:
- 2017-07-28T21:57:40+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
r31832 r31833 42 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 45 OPENSSL_PKG = openssl/openssl-1.0.2l 46 #OPENSSL_PKG = openssl/openssl-1.1.0f 45 47 # When doing make clean, remove OpenSSL products too 46 48 OPENSSL_PRODUCTS = certs man misc private openssl.cnf -
main/trunk/greenstone2/build-src/packages/Makefile.in
r31832 r31833 42 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 45 OPENSSL_PKG = openssl/openssl-1.0.2l 46 #OPENSSL_PKG = openssl/openssl-1.1.0f 45 47 # When doing make clean, remove OpenSSL products too 46 48 OPENSSL_PRODUCTS = certs man misc private openssl.cnf -
main/trunk/greenstone2/build-src/packages/configure
r31832 r31833 155 155 gzip -dc $openssl_pkgname.tar.gz | tar -xf - 156 156 fi 157 cd openssl-1.0.2l157 cd $openssl_pkgname 158 158 159 159 # configure 160 160 # see the INSTALL file for OpenSSL to see config options for openssl 161 # If you ever want to have the .a libraries that building openssl generates,162 # then use the --prefix and point it to the $bindir.163 161 # --prefix indicates where the generated lib, include and bin folders will go 164 162 # --openssldir will contain the manuals and other non-essentials 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 163 # BEWARE: The defaults for --prefix and meaning of --openssldir differ between 164 # versions of openssl. In the earlier version (1.0.* like 1.0.2l), if 165 # --prefix is not supplied then the generated lib, include and bin folders 166 # will also go into --openssldir. 167 # In the newer version 1.1.* 1.1.0f, if --prefix is not supplied, it will 168 # try to install the generated lib, include and bin folders into a system place. 169 # So better to provide both --opennssldir and --prefix, for both openssl versions 170 # to compile succesfully. 171 # If you ever want to have the .a libraries that building openssl generates, 172 # then point the --prefix to the $bindir. We currently don't need to put them 173 # into $bindir/openssl for wget to use, since wget is built against openssl's 174 # static libraries and therefore wget doesn't need these when running. 175 echo ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared 176 ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared 169 177 # make 170 178 echo make … … 281 289 282 290 # 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_extraarg291 ##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 292 ##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_extraargs293 ##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 294 287 295 # 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_extraargs296 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 297 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_extraargs298 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 299 292 300
Note:
See TracChangeset
for help on using the changeset viewer.