[csw-devel] SF.net SVN: gar:[22007] csw/mgar/pkg/lzlib/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Sep 25 16:53:17 CEST 2013


Revision: 22007
          http://gar.svn.sourceforge.net/gar/?rev=22007&view=rev
Author:   dmichelsen
Date:     2013-09-25 14:53:17 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
lzlib/trunk: Update to 1.5

Modified Paths:
--------------
    csw/mgar/pkg/lzlib/trunk/Makefile
    csw/mgar/pkg/lzlib/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/lzlib/trunk/files/0001-Use-Sun-Studio-syntax-for-shared-libs.patch
    csw/mgar/pkg/lzlib/trunk/files/0001-sh-does-not-support-e.patch

Removed Paths:
-------------
    csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch
    csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch

Modified: csw/mgar/pkg/lzlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzlib/trunk/Makefile	2013-09-25 12:03:21 UTC (rev 22006)
+++ csw/mgar/pkg/lzlib/trunk/Makefile	2013-09-25 14:53:17 UTC (rev 22007)
@@ -1,5 +1,5 @@
 NAME = lzlib
-VERSION = 1.2
+VERSION = 1.5
 GARTYPE = v2
 
 DESCRIPTION = A lossless data compression library based on the LZMA algorithm
@@ -10,9 +10,9 @@
 endef
 
 MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES =  0001-gcc-to-sunstudio.patch
-PATCHFILES += 0002-gcc-to-sunstudio-2.patch
+DISTFILES += $(DISTNAME).tar.lz
+PATCHFILES += 0001-Use-Sun-Studio-syntax-for-shared-libs.patch
+PATCHFILES += 0001-sh-does-not-support-e.patch
 
 VENDOR_URL = http://www.nongnu.org/lzip/lzlib.html
 
@@ -26,6 +26,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWliblz-dev = CSWliblz1
 
+EXTRA_CFLAGS = -xc99=all
 EXTRA_CXXFLAGS = -xcode=pic32
 EXTRA_LINKER_FLAGS = -lCrun -norunpath
 
@@ -33,9 +34,9 @@
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
-CONFIGURE_ARGS += CXX="$(CXX)"
+CONFIGURE_ARGS += CC="$(CC)"
 CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)"
-CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)"
+CONFIGURE_ARGS += CFLAGS="$(CFLAGS)"
 CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)"
 
 INSTALL_OVERRIDE_VARS = INSTALL LDCONFIG
@@ -44,8 +45,3 @@
 INSTALL_OVERRIDE_VAR_LDCONFIG = echo
 
 include gar/category.mk
-
-post-install-modulated:
-	gln -s liblz.so.1 $(DESTDIR)$(libdir)/liblz.so
-	@$(MAKECOOKIE)
-

Modified: csw/mgar/pkg/lzlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/lzlib/trunk/checksums	2013-09-25 12:03:21 UTC (rev 22006)
+++ csw/mgar/pkg/lzlib/trunk/checksums	2013-09-25 14:53:17 UTC (rev 22007)
@@ -1 +1 @@
-7a77358000929bb0a31ad6b68a139b9d  lzlib-1.2.tar.gz
+6378ea07986891b6fb4d7f55c14de60f  lzlib-1.5.tar.lz

Added: csw/mgar/pkg/lzlib/trunk/files/0001-Use-Sun-Studio-syntax-for-shared-libs.patch
===================================================================
--- csw/mgar/pkg/lzlib/trunk/files/0001-Use-Sun-Studio-syntax-for-shared-libs.patch	                        (rev 0)
+++ csw/mgar/pkg/lzlib/trunk/files/0001-Use-Sun-Studio-syntax-for-shared-libs.patch	2013-09-25 14:53:17 UTC (rev 22007)
@@ -0,0 +1,25 @@
+From 0a4382b02f30efcebf1f3337722d012ae79e8fe7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 5 Aug 2013 13:29:27 +0200
+Subject: [PATCH] Use Sun Studio syntax for shared libs
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7be45f7..3d0e4df 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,7 +21,7 @@ lib$(libname).a : lzlib.o
+ 	$(AR) -rcs $@ $<
+ 
+ lib$(libname).so.$(pkgversion) : lzlib_sh.o
+-	$(CC) -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $<
++	$(CC) $(LDFLAGS) -G -h lib$(libname).so.$(soversion) -o $@ $<
+ 
+ $(progname) : $(objs) lib$(libname).a
+ 	$(CC) $(LDFLAGS) -o $@ $(objs) lib$(libname).a
+-- 
+1.8.3.1
+

Deleted: csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch
===================================================================
--- csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch	2013-09-25 12:03:21 UTC (rev 22006)
+++ csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch	2013-09-25 14:53:17 UTC (rev 22007)
@@ -1,135 +0,0 @@
-From b1bae1c247333427284ee2e4a318a2769d6f3022 Mon Sep 17 00:00:00 2001
-From: THURNER rupert <rupert at opencsw.org>
-Date: Wed, 5 Jan 2011 12:14:58 -0600
-Subject: [PATCH] gcc-to-sunstudio
-
-change buildflags and include types.
----
- Makefile.in        |    4 ++--
- configure          |    2 +-
- decoder.cc         |    2 +-
- encoder.cc         |    2 +-
- lzcheck.cc         |    2 +-
- lzlib.cc           |    2 +-
- main.cc            |    3 ++-
- testsuite/check.sh |    3 +++
- 8 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 94e0114..65aee48 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -23,7 +23,7 @@ lib$(libname).a: $(lib_objs)
- 	$(AR) -rcs $@ $^
- 
- lib$(libname).so.$(pkgversion) : $(sh_lib_objs)
--	$(CXX) -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $^
-+	$(CXX) $(LDFLAGS) -G -h lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs)
- 
- $(progname) : $(objs) lib$(libname).a
- 	$(CXX) $(LDFLAGS) -o $@ $^
-@@ -96,7 +96,7 @@ install : all install-info
- 	$(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a"
- 	if [ -n "$(progname_shared)" ] ; then \
- 	  $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \
--	  if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \
-+	  if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \
- 	    run_ldconfig=no ; rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \
- 	  else run_ldconfig=yes ; \
- 	  fi ; \
-diff --git a/configure b/configure
-index ca758e4..fffae27 100755
---- a/configure
-+++ b/configure
-@@ -32,7 +32,7 @@ mandir='$(datadir)/man'
- sysconfdir='$(prefix)/etc'
- CXX=
- CPPFLAGS=
--CXXFLAGS='-Wall -W -O2'
-+CXXFLAGS=
- LDFLAGS=
- 
- # Loop over all args
-diff --git a/decoder.cc b/decoder.cc
-index 0d8d4d5..4622a4e 100644
---- a/decoder.cc
-+++ b/decoder.cc
-@@ -31,7 +31,7 @@
- #include <cerrno>
- #include <cstdlib>
- #include <cstring>
--#include <stdint.h>
-+#include <inttypes.h>
- 
- #include "lzlib.h"
- #include "lzip.h"
-diff --git a/encoder.cc b/encoder.cc
-index a0001c1..193ece9 100644
---- a/encoder.cc
-+++ b/encoder.cc
-@@ -31,7 +31,7 @@
- #include <cerrno>
- #include <cstdlib>
- #include <cstring>
--#include <stdint.h>
-+#include <inttypes.h>
- 
- #include "lzlib.h"
- #include "lzip.h"
-diff --git a/lzcheck.cc b/lzcheck.cc
-index ce53a41..3ccf1d7 100644
---- a/lzcheck.cc
-+++ b/lzcheck.cc
-@@ -18,7 +18,7 @@
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
--#include <stdint.h>
-+#include <inttypes.h>
- #include <unistd.h>
- 
- #include "lzlib.h"
-diff --git a/lzlib.cc b/lzlib.cc
-index 4a4b77b..5172a15 100644
---- a/lzlib.cc
-+++ b/lzlib.cc
-@@ -27,7 +27,7 @@
- 
- #include <algorithm>
- #include <cstring>
--#include <stdint.h>
-+#include <inttypes.h>
- 
- #include "lzlib.h"
- #include "lzip.h"
-diff --git a/main.cc b/main.cc
-index afcabfe..1665c61 100644
---- a/main.cc
-+++ b/main.cc
-@@ -33,7 +33,8 @@
- #include <string>
- #include <vector>
- #include <fcntl.h>
--#include <stdint.h>
-+#include <inttypes.h>
-+#include <signal.h>
- #include <unistd.h>
- #include <utime.h>
- #include <sys/stat.h>
-diff --git a/testsuite/check.sh b/testsuite/check.sh
-index be6204b..f7dc03a 100755
---- a/testsuite/check.sh
-+++ b/testsuite/check.sh
-@@ -5,6 +5,9 @@
- # This script is free software: you have unlimited permission
- # to copy, distribute and modify it.
- 
-+PATH=/usr/ucb:$PATH
-+export PATH
-+
- LC_ALL=C
- export LC_ALL
- objdir=`pwd`
--- 
-1.7.3.2
-

Added: csw/mgar/pkg/lzlib/trunk/files/0001-sh-does-not-support-e.patch
===================================================================
--- csw/mgar/pkg/lzlib/trunk/files/0001-sh-does-not-support-e.patch	                        (rev 0)
+++ csw/mgar/pkg/lzlib/trunk/files/0001-sh-does-not-support-e.patch	2013-09-25 14:53:17 UTC (rev 22007)
@@ -0,0 +1,31 @@
+From 0afe0e4a52cd6b0e8db4e5c3c48aaf3346d8151d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 25 Sep 2013 16:01:48 +0200
+Subject: [PATCH] sh does not support -e
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 3d0e4df..1cab86e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,12 +86,12 @@ install-bin : all
+ 	$(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a"
+ 	if [ -n "$(progname_shared)" ] ; then \
+ 	  $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \
+-	  if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \
++	  if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \
+ 	    rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \
+ 	    run_ldconfig=no ; \
+ 	  else run_ldconfig=yes ; \
+ 	  fi ; \
+-	  if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so" ] ; then \
++	  if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so" ] ; then \
+ 	    rm -f "$(DESTDIR)$(libdir)/lib$(libname).so" ; \
+ 	  fi ; \
+ 	  cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so ; \
+-- 
+1.8.3.4
+

Deleted: csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch
===================================================================
--- csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch	2013-09-25 12:03:21 UTC (rev 22006)
+++ csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch	2013-09-25 14:53:17 UTC (rev 22007)
@@ -1,25 +0,0 @@
-From 68db975872497081807f900e60d1bbb159b82f51 Mon Sep 17 00:00:00 2001
-From: THURNER rupert <rupert at opencsw.org>
-Date: Wed, 5 Jan 2011 12:26:50 -0600
-Subject: [PATCH] gcc-to-sunstudio-2
-
----
- bbexample.cc |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bbexample.cc b/bbexample.cc
-index df91300..1b65bf7 100644
---- a/bbexample.cc
-+++ b/bbexample.cc
-@@ -17,7 +17,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include <unistd.h>
- 
- #include "lzlib.h"
--- 
-1.7.3.2
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list