[csw-devel] SF.net SVN: gar:[8658] csw/mgar/pkg/lzlib/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Feb 18 18:36:50 CET 2010
Revision: 8658
http://gar.svn.sourceforge.net/gar/?rev=8658&view=rev
Author: dmichelsen
Date: 2010-02-18 17:36:50 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
lzlib: Move towards Sun Studio compiler, linkage libC and docs missing
Modified Paths:
--------------
csw/mgar/pkg/lzlib/trunk/Makefile
csw/mgar/pkg/lzlib/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch
csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch
csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch
csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch
Modified: csw/mgar/pkg/lzlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzlib/trunk/Makefile 2010-02-18 16:30:06 UTC (rev 8657)
+++ csw/mgar/pkg/lzlib/trunk/Makefile 2010-02-18 17:36:50 UTC (rev 8658)
@@ -1,5 +1,5 @@
GARNAME = lzlib
-GARVERSION = 0.8-rc1
+GARVERSION = 0.9
CATEGORIES = lib
DESCRIPTION = lzlib is a lossless data compression library based on the LZMA algorithm.
@@ -9,17 +9,47 @@
data. The compressed data format used by the library is the lzip format.
endef
-MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/
+MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = 0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch
+PATCHFILES += 0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch
+PATCHFILES += 0001-Do-not-do-ldconfig.patch
+PATCHFILES += 0002-Use-ucb-echo-as-it-only-understands-n.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-# If the url used to check for software update is different of MASTER_SITES, then
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES =
+VENDOR_URL = http://www.nongnu.org/lzip/lzlib.html
-GARCOMPILER = GNU
+EXTRA_CXXFLAGS = -xcode=pic32
+
+# GARCOMPILER = GNU
+BUILD64 = 1
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-shared
+CONFIGURE_ARGS += CXX="$(CXX)"
+CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)"
+CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)"
+CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)"
+#BUILD_OVERRIDE_VARS = CXX CPPFLAGS CXXFLAGS LDFLAGS
+#BUILD_OVERRIDE_VAR_CXX = $(CXX)
+#BUILD_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS)
+#BUILD_OVERRIDE_VAR_CXXFLAGS = $(CXXFLAGS)
+#BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS)
+
+#TEST_OVERRIDE_VARS = CXX CPPFLAGS CXXFLAGS LDFLAGS
+#TEST_OVERRIDE_VAR_CXX = $(CXX)
+#TEST_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS)
+#TEST_OVERRIDE_VAR_CXXFLAGS = $(CXXFLAGS)
+#TEST_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS)
+
+TEST_TARGET = check
+
+INSTALL_OVERRIDE_VARS = INSTALL
+INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall
+
include gar/category.mk
+
+# Only ucb echo understands -n
+# PATH := /usr/ucb:$(PATH)
Modified: csw/mgar/pkg/lzlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/lzlib/trunk/checksums 2010-02-18 16:30:06 UTC (rev 8657)
+++ csw/mgar/pkg/lzlib/trunk/checksums 2010-02-18 17:36:50 UTC (rev 8658)
@@ -1 +1,5 @@
-cdb51b3a9fb9b01a7582a5ad797377ca lzlib-0.8-rc1.tar.gz
+8d8488783fd776ead11ab9b19b63f4bf 0001-Do-not-do-ldconfig.patch
+ae8e904a8c07f7533b94eaf8bfb2075d 0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch
+fe24dd11cfece198006a781133fb13fa 0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch
+dcb22fb244b8d124742cad9ddd18985a 0002-Use-ucb-echo-as-it-only-understands-n.patch
+65382168a05975e550f5381f99efc0c6 lzlib-0.9.tar.gz
Added: csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch
===================================================================
--- csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch (rev 0)
+++ csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch 2010-02-18 17:36:50 UTC (rev 8658)
@@ -0,0 +1,30 @@
+From e81994a6f342f98d03c7008b1865bb8f29e6931b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 18 Feb 2010 18:19:49 +0100
+Subject: [PATCH 1/2] Do not do ldconfig
+
+---
+ Makefile.in | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c2ba00d..e51513b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -92,12 +92,11 @@ 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 ; \
+ cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so.$(soversion) ; \
+- if [ $${run_ldconfig} = yes ] ; then $(LDCONFIG) "$(DESTDIR)$(libdir)" ; fi ; \
+ fi
+
+ install-info :
+--
+1.6.6
+
Added: csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch
===================================================================
--- csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch (rev 0)
+++ csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch 2010-02-18 17:36:50 UTC (rev 8658)
@@ -0,0 +1,95 @@
+From 015e68da03c76cdd90f5f8879259e1648717062e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 18 Feb 2010 17:46:25 +0100
+Subject: [PATCH] Remove Linux specific stuff, add Solaris specific stuff
+
+---
+ configure | 2 +-
+ decoder.cc | 2 +-
+ encoder.cc | 2 +-
+ lzcheck.cc | 2 +-
+ lzlib.cc | 2 +-
+ main.cc | 3 ++-
+
+diff --git a/configure b/configure
+index fe01eac..eb9dbc8 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 429d33e..0d69bcc 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 1b979ed..7625a35 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 b54f525..54a4869 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 de5d0a9..0abc3d3 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 3d4c0f6..fb78a1e 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>
+--
+1.6.6
+
Added: csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch
===================================================================
--- csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch (rev 0)
+++ csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch 2010-02-18 17:36:50 UTC (rev 8658)
@@ -0,0 +1,25 @@
+From ccab3f0f516aa027a935e70e77ff0c0b0a6445f8 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 18 Feb 2010 18:08:08 +0100
+Subject: [PATCH] Change linker flags for shared libs to be Sun Studio
+
+---
+ Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a68698a..c2ba00d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -23,7 +23,7 @@ lib$(libname).a: $(lib_objs)
+ $(AR) -rcs lib$(libname).a $(lib_objs)
+
+ lib$(libname).so.$(pkgversion) : $(sh_lib_objs)
+- $(CXX) -shared -Wl,--soname=lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs)
++ $(CXX) $(LDFLAGS) -G -h lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs)
+
+ $(progname) : $(objs) lib$(libname).a
+ $(CXX) $(LDFLAGS) -o $(progname) $(objs) lib$(libname).a
+--
+1.6.6
+
Added: csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch
===================================================================
--- csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch (rev 0)
+++ csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch 2010-02-18 17:36:50 UTC (rev 8658)
@@ -0,0 +1,26 @@
+From 583bcd2e4276b290bd8cf29894292a1fe5b0057a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 18 Feb 2010 18:20:56 +0100
+Subject: [PATCH 2/2] Use ucb echo as it only understands -n
+
+---
+ testsuite/check.sh | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/testsuite/check.sh b/testsuite/check.sh
+index e35876d..69b5c03 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.6.6
+
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