Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-zlib-ng grimoire by Pavel Vinogradov (6cff8b398c31028544ed8defe27d42678d3a3522)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-zlib-ng grimoire by Pavel Vinogradov (6cff8b398c31028544ed8defe27d42678d3a3522)
  • Date: Thu, 11 Jun 2015 05:14:27 +0000

GIT changes to devel-zlib-ng grimoire by Pavel Vinogradov
<public AT sourcemage.org>:

archive-libs/zlib-ng/BUILD | 20 +++-----------------
archive-libs/zlib-ng/DEPENDS | 3 +--
archive-libs/zlib-ng/HISTORY | 6 ++++++
archive-libs/zlib-ng/INSTALL | 1 +
archive-libs/zlib-ng/PRE_BUILD | 4 ++++
archive-libs/zlib-ng/PROVIDES | 1 +
archive-libs/zlib-ng/pkgpath.patch | 22 ++++++++++++++++++++++
archive-libs/zlib/CONFLICTS | 1 +
archive-libs/zlib/HISTORY | 4 ++++
archive-libs/zlib/PROVIDES | 1 +
10 files changed, 44 insertions(+), 19 deletions(-)

New commits:
commit 6cff8b398c31028544ed8defe27d42678d3a3522
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

archive-libs/zlib: conflicts with zlib-ng, added ZLIBRARY provider

commit 8eb644c668994b982a1d923e1e9b4a8022dedb12
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

archive-libs/zlib-ng: switched build system, added ZLIBRARY provider

diff --git a/archive-libs/zlib-ng/BUILD b/archive-libs/zlib-ng/BUILD
index 856cbb9..982aec3 100755
--- a/archive-libs/zlib-ng/BUILD
+++ b/archive-libs/zlib-ng/BUILD
@@ -1,19 +1,5 @@
-cd "$SOURCE_DIRECTORY" &&
-mkdir -p build &&
-cd build &&
-prepare_cmake_flags &&
+OPTS="--eprefix=$INSTALL_ROOT --zlib-compat $OPTS" &&

-CMAKE_INSTALL_PREFIX="$INSTALL_ROOT/usr"
+./configure --prefix=${TRACK_ROOT}/usr $OPTS &&

-message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX &&
-
-cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
- -DCMAKE_INSTALL_LIBDIR="$INSTALL_ROOT"/lib \
- -DCMAKE_INSTALL_MANDIR=share/man \
- -DCMAKE_PREFIX_PATH=share/apps/cmake/modules \
- -DSYSCONFDIR="$INSTALL_ROOT"/etc \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
- $OPTS ../ &&
-make
+make DESTDIR=$INSTALL_ROOT
diff --git a/archive-libs/zlib-ng/DEPENDS b/archive-libs/zlib-ng/DEPENDS
index ef7ca9e..21f6e3f 100755
--- a/archive-libs/zlib-ng/DEPENDS
+++ b/archive-libs/zlib-ng/DEPENDS
@@ -1,2 +1 @@
-depends git &&
-depends cmake
+depends git
diff --git a/archive-libs/zlib-ng/HISTORY b/archive-libs/zlib-ng/HISTORY
index 9b3b310..554c6fe 100644
--- a/archive-libs/zlib-ng/HISTORY
+++ b/archive-libs/zlib-ng/HISTORY
@@ -1,2 +1,8 @@
+2015-06-10 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, INSTALL, PRE_BUILD, pkgpath.patch: switched to ./configure &&
+ make, borrowed slightly modified patch from zlib spell
+ * DEPENDS: removed cmake
+ * PROVIDES: added ZLIBRARY provider
+
2015-06-05 Pavel Vinogradov <public AT sourcemage.org>
* BUILD, DETAILS, DEPENDS, CONFLICTS, PREPARE: created spell
diff --git a/archive-libs/zlib-ng/INSTALL b/archive-libs/zlib-ng/INSTALL
new file mode 100755
index 0000000..51bdf9f
--- /dev/null
+++ b/archive-libs/zlib-ng/INSTALL
@@ -0,0 +1 @@
+make prefix=$INSTALL_ROOT/usr install
diff --git a/archive-libs/zlib-ng/PRE_BUILD b/archive-libs/zlib-ng/PRE_BUILD
new file mode 100755
index 0000000..c61a8af
--- /dev/null
+++ b/archive-libs/zlib-ng/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch"
diff --git a/archive-libs/zlib-ng/PROVIDES b/archive-libs/zlib-ng/PROVIDES
new file mode 100755
index 0000000..20be80a
--- /dev/null
+++ b/archive-libs/zlib-ng/PROVIDES
@@ -0,0 +1 @@
+ZLIBRARY
diff --git a/archive-libs/zlib-ng/pkgpath.patch
b/archive-libs/zlib-ng/pkgpath.patch
new file mode 100644
index 0000000..01e14df
--- /dev/null
+++ b/archive-libs/zlib-ng/pkgpath.patch
@@ -0,0 +1,22 @@
+--- Makefile.in.orig 2015-06-10 20:43:35.972063316 -0400
++++ Makefile.in 2015-06-10 20:47:12.623442942 -0400
+@@ -64,7 +64,7 @@
+ includedir = ${prefix}/include
+ mandir = ${prefix}/share/man
+ man3dir = ${mandir}/man3
+-pkgconfigdir = ${libdir}/pkgconfig
++pkgconfigdir = ${prefix}/lib/pkgconfig
+
+ OBJZ = adler32.o compress.o crc32.o deflate.o match.o infback.o inffast.o
inflate.o inftrees.o trees.o uncompr.o zutil.o $(ARCH_STATIC_OBJS)
+ OBJG = gzclose.o gzlib.o gzread.o gzwrite.o
+@@ -258,8 +258,8 @@
+
+ install: install-libs
+ -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p
$(DESTDIR)$(includedir); fi
+- cp $(SRCDIR)/zlib.h zconf.h $(DESTDIR)$(includedir)
+- chmod 644 $(DESTDIR)$(includedir)/zlib.h
$(DESTDIR)$(includedir)/zconf.h
++ cp $(SRCDIR)/zlib.h zconf.h zutil.h $(DESTDIR)$(includedir)
++ chmod 644 $(DESTDIR)$(includedir)/zlib.h
$(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zutil.h
+
+ uninstall-static:
+ cd $(DESTDIR)$(libdir) && rm -f $(STATICLIB)
diff --git a/archive-libs/zlib/CONFLICTS b/archive-libs/zlib/CONFLICTS
new file mode 100755
index 0000000..b75a668
--- /dev/null
+++ b/archive-libs/zlib/CONFLICTS
@@ -0,0 +1 @@
+conflicts zlib-ng y
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index 1d71fc0..3daadc8 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,7 @@
+2015-06-10 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: conflicts with zlib-ng
+ * PROVIDES: added ZLIBRARY provider
+
2015-03-29 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: moved removal of extra src dirs to FINAL, otherwise it
prevents castfs from proper unmounting
diff --git a/archive-libs/zlib/PROVIDES b/archive-libs/zlib/PROVIDES
new file mode 100755
index 0000000..20be80a
--- /dev/null
+++ b/archive-libs/zlib/PROVIDES
@@ -0,0 +1 @@
+ZLIBRARY



  • [SM-Commit] GIT changes to devel-zlib-ng grimoire by Pavel Vinogradov (6cff8b398c31028544ed8defe27d42678d3a3522), Pavel Vinogradov, 06/11/2015

Archive powered by MHonArc 2.6.24.

Top of Page