diff options
| author | eschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b> | 2013-03-15 19:19:56 +0000 |
|---|---|---|
| committer | eschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b> | 2013-03-15 19:19:56 +0000 |
| commit | 98327fc896718a1808e1bc9d79f894563af69392 (patch) | |
| tree | 26c6513cdf9b2287e6ba0e869a2f7a541c4a11fb | |
| parent | 608c146d5759550ce45b320e5802e284be01042a (diff) | |
Disable shared libraries
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/zlib/trunk@21 d47fded2-66c1-406f-af09-4fc0800f9c6b
| -rw-r--r-- | configure.sh | 5 | ||||
| -rw-r--r-- | dist/install.diff | 16 |
2 files changed, 1 insertions, 20 deletions
diff --git a/configure.sh b/configure.sh index 3d01c8d..3202d02 100644 --- a/configure.sh +++ b/configure.sh @@ -136,13 +136,10 @@ then echo "zlib: Unpacking archive..." pushd ${BUILD_DIR} ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz - #${PATCH?} -p0 < ${SRCDIR}/dist/install.diff echo "zlib: Configuring..." cd ${NAME} - # Guess whether Cactus uses static linking, and if so, build - # only static libraries - ./configure --prefix=${ZLIB_DIR} $(if echo '' ${LDFLAGS} | grep -q static; then echo '' '--static'; fi) + ./configure --prefix=${ZLIB_DIR} --static echo "zlib: Building..." ${MAKE} diff --git a/dist/install.diff b/dist/install.diff deleted file mode 100644 index f8e4951..0000000 --- a/dist/install.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru zlib-1.2.5.orig/Makefile.in zlib-1.2.5/Makefile.in ---- zlib-1.2.5.orig/Makefile.in 2010-04-20 00:12:21.000000000 -0400 -+++ zlib-1.2.5/Makefile.in 2011-01-01 19:43:38.000000000 -0500 -@@ -167,9 +167,9 @@ - -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi - -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi - -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi -- cp $(STATICLIB) $(DESTDIR)$(libdir) -- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) -- cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) -+ -cp $(STATICLIB) $(DESTDIR)$(libdir) -+ -cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) -+ -cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) - -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 - -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ - chmod 755 $(SHAREDLIBV); \ |