[csw-devel] SF.net SVN: gar:[7081] csw/mgar/pkg/gsm/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Nov 2 17:23:47 CET 2009
Revision: 7081
http://gar.svn.sourceforge.net/gar/?rev=7081&view=rev
Author: dmichelsen
Date: 2009-11-02 16:23:45 +0000 (Mon, 02 Nov 2009)
Log Message:
-----------
gsm: Add patches for 64 bit compilation
Modified Paths:
--------------
csw/mgar/pkg/gsm/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch
csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch
Modified: csw/mgar/pkg/gsm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gsm/trunk/Makefile 2009-11-02 16:21:53 UTC (rev 7080)
+++ csw/mgar/pkg/gsm/trunk/Makefile 2009-11-02 16:23:45 UTC (rev 7081)
@@ -34,14 +34,25 @@
TEST_TARGET = tst addtst misc
TEST_ARGS = $(BUILD_ARGS)
-INSTALL_ARGS = TOAST_INSTALL_ROOT="$(DESTDIR)$(prefix)"
-INSTALL_ARGS += GSM_INSTALL_ROOT="$(DESTDIR)$(prefix)"
+INSTALL_SCRIPTS = custom
+#INSTALL_ARGS = TOAST_INSTALL_ROOT="$(DESTDIR)$(prefix)"
+#INSTALL_ARGS += GSM_INSTALL_ROOT="$(DESTDIR)$(prefix)"
include gar/category.mk
-pre-install-modulated:
+post-build-modulated:
+
+install-custom:
ginstall -d $(DESTDIR)$(bindir)
+ ginstall $(WORKSRC)/bin/toast $(DESTDIR)$(bindir)
+ gln untoast $(DESTDIR)$(bindir)/toast
+ gln tcat $(DESTDIR)$(bindir)/toast
ginstall -d $(DESTDIR)$(libdir)
- ginstall -d $(DESTDIR)$(prefix)/inc
- ginstall -d $(DESTDIR)$(prefix)/man/man1
+ ginstall $(WORKSRC)/lib/libgsm.a $(DESTDIR)$(libdir)
+ ginstall -d $(DESTDIR)$(includedir)
+ ginstall $(WORKSRC)/inc/gsm.h $(DESTDIR)$(includedir)
+ ginstall -d $(DESTDIR)$(mandir)/man1
+ ginstall $(WORKSRC)/man/toast.1 $(DESTDIR)$(mandir)/man1
+ ginstall -d $(DESTDIR)$(mandir)/man3
+ ginstall $(WORKSRC)/man/*.3 $(DESTDIR)$(mandir)/man3
@$(MAKECOOKIE)
Added: csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch
===================================================================
--- csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch (rev 0)
+++ csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch 2009-11-02 16:23:45 UTC (rev 7081)
@@ -0,0 +1,34 @@
+From 3da2e2e562fc914c6f908cebf4e6c29210615136 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 2 Nov 2009 09:41:10 +0100
+Subject: [PATCH 1/2] Fix types for 64 bit
+
+---
+ inc/private.h | 10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/inc/private.h b/inc/private.h
+index 0c94255..316c328 100644
+--- a/inc/private.h
++++ b/inc/private.h
+@@ -9,11 +9,13 @@
+ #ifndef PRIVATE_H
+ #define PRIVATE_H
+
+-typedef short word; /* 16 bit signed int */
+-typedef long longword; /* 32 bit signed int */
++#include <sys/int_types.h>
+
+-typedef unsigned short uword; /* unsigned word */
+-typedef unsigned long ulongword; /* unsigned longword */
++typedef int16_t word; /* 16 bit signed int */
++typedef int32_t longword; /* 32 bit signed int */
++
++typedef uint16_t uword; /* unsigned word */
++typedef uint32_t ulongword; /* unsigned longword */
+
+ struct gsm_state {
+
+--
+1.6.5
+
Added: csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch
===================================================================
--- csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch (rev 0)
+++ csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch 2009-11-02 16:23:45 UTC (rev 7081)
@@ -0,0 +1,140 @@
+From 158e510f219f29090b4fda509dc5372f9bdd98c7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 2 Nov 2009 09:42:37 +0100
+Subject: [PATCH 2/2] Don't throw errors if removed files don't exist
+
+---
+ Makefile | 38 +++++++++++++++++++-------------------
+ 1 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index cfab74f..571eb5a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@ SASR = -DSASR
+
+ # LTP_CUT = -DLTP_CUT
+ LTP_CUT =
+-######### Define to enable the GSM library's long-term correlation
++######### Define to enable the GSM library's long-term -f correlation
+ ######### approximation option---faster, but worse; works for
+ ######### both integer and floating point multiplications.
+ ######### This flag is still in the experimental stage.
+@@ -300,7 +300,7 @@ install: toastinstall gsminstall
+ # The basic API: libgsm
+
+ $(LIBGSM): $(LIB) $(GSM_OBJECTS)
+- -rm $(RMFLAGS) $(LIBGSM)
++ -rm -f $(RMFLAGS) $(LIBGSM)
+ $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+ $(RANLIB) $(LIBGSM)
+
+@@ -311,11 +311,11 @@ $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
+
+ $(UNTOAST): $(BIN) $(TOAST)
+- -rm $(RMFLAGS) $(UNTOAST)
++ -rm -f $(RMFLAGS) $(UNTOAST)
+ $(LN) $(TOAST) $(UNTOAST)
+
+ $(TCAT): $(BIN) $(TOAST)
+- -rm $(RMFLAGS) $(TCAT)
++ -rm -f $(RMFLAGS) $(TCAT)
+ $(LN) $(TOAST) $(TCAT)
+
+
+@@ -342,59 +342,59 @@ toastinstall:
+
+ gsmuninstall:
+ -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
+- rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \
++ rm -f $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \
+ fi
+
+ toastuninstall:
+ -if [ x"$(TOAST_INSTALL_ROOT)" != x ] ; then \
+- rm $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \
++ rm -f $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \
+ fi
+
+ $(TOAST_INSTALL_BIN)/toast: $(TOAST)
+- -rm $@
++ -rm -f $@
+ cp $(TOAST) $@
+ chmod 755 $@
+
+ $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
+- -rm $@
++ -rm -f $@
+ ln $? $@
+
+ $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
+- -rm $@
++ -rm -f $@
+ ln $? $@
+
+ $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
+- -rm $@
++ -rm -f $@
+ cp $? $@
+ chmod 444 $@
+
+ $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
+- -rm $@
++ -rm -f $@
+ cp $? $@
+ chmod 444 $@
+
+ $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
+- -rm $@
++ -rm -f $@
+ cp $? $@
+ chmod 444 $@
+
+ $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
+- -rm $@
++ -rm -f $@
+ cp $? $@
+ chmod 444 $@
+
+ $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
+- -rm $@
++ -rm -f $@
+ cp $? $@
+ chmod 444 $@
+
+ $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
+- -rm $@
++ -rm -f $@
+ cp $? $@
+ chmod 444 $@
+
+ $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
+- -rm $@
++ -rm -f $@
+ cp $? $@
+ chmod 444 $@
+
+@@ -416,16 +416,16 @@ uninstall: toastuninstall gsmuninstall
+ @-echo uninstall: Done.
+
+ semi-clean:
+- -rm $(RMFLAGS) */*.o \
++ -rm -f $(RMFLAGS) */*.o \
+ $(TST)/lin2cod $(TST)/lin2txt \
+ $(TST)/cod2lin $(TST)/cod2txt \
+ $(TST)/gsm2cod \
+ $(TST)/*.*.*
+ -$(FIND) . \( -name core -o -name foo \) \
+- -print | xargs rm $(RMFLAGS)
++ -print | xargs rm -f $(RMFLAGS)
+
+ clean: semi-clean
+- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
++ -rm -f $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
+ $(TOAST) $(TCAT) $(UNTOAST) \
+ $(ROOT)/gsm-1.0.tar.Z
+
+--
+1.6.5
+
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