aboutsummaryrefslogtreecommitdiff
path: root/lang/tinycobol/files
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2006-01-20 15:35:39 +0000
committerPav Lucistnik <pav@FreeBSD.org>2006-01-20 15:35:39 +0000
commit4edbaffde56b7bafd59fa0247572e4e405f51025 (patch)
tree0131c7211a0d339c1ccc77159e1c194c91f0e2d3 /lang/tinycobol/files
parent276e22cb9a34631b227c8c40657ca818bcd2db18 (diff)
Notes
Diffstat (limited to 'lang/tinycobol/files')
-rw-r--r--lang/tinycobol/files/patch-cobrun_Makefile.in27
-rw-r--r--lang/tinycobol/files/patch-compiler_scan.l6
-rw-r--r--lang/tinycobol/files/patch-configure10
-rw-r--r--lang/tinycobol/files/patch-lib_Makefile.in26
4 files changed, 66 insertions, 3 deletions
diff --git a/lang/tinycobol/files/patch-cobrun_Makefile.in b/lang/tinycobol/files/patch-cobrun_Makefile.in
new file mode 100644
index 000000000000..eccf7add1332
--- /dev/null
+++ b/lang/tinycobol/files/patch-cobrun_Makefile.in
@@ -0,0 +1,27 @@
+--- cobrun/Makefile.in.orig Thu Jul 21 14:57:52 2005
++++ cobrun/Makefile.in Thu Jan 19 21:52:38 2006
+@@ -19,11 +19,11 @@
+
+ CCX=@CC@
+
+-INCLUDES=-I../lib -I../
++INCLUDES=@INCLUDES@
+ LIBS=
+-LIBS1=-lncurses -ldb -lm -ldl
+-LIBS2=-L../lib -lhtcobol -lncurses -ldb -lm -ldl
+-LDFLAGS=
++LIBS1=-lncurses @htg_ld_args_m@ @htg_ld_args_db@ @htg_ld_args_readline@
++LIBS2=-L../lib -lhtcobol -lncurses @htg_ld_args_m@ @htg_ld_args_db@
++LDFLAGS=@LDFLAGS@
+ CCXFLAGS=${INCLUDES}
+
+
+@@ -54,7 +54,7 @@
+ ${PROG1}:
+ ${CCX} ${SRC1} -Wl,-export-dynamic -o ${PROG1} \
+ ${INCLUDES} -Wl,-whole-archive ${tc_library} \
+- -Wl,-no-whole-archive $(LIBS1)
++ -Wl,-no-whole-archive $(LDFLAGS) $(LIBS1)
+
+ # Shared library version
+ ${PROG2}: ${OBJ2}
diff --git a/lang/tinycobol/files/patch-compiler_scan.l b/lang/tinycobol/files/patch-compiler_scan.l
index e43424664d98..ce3bb73b8196 100644
--- a/lang/tinycobol/files/patch-compiler_scan.l
+++ b/lang/tinycobol/files/patch-compiler_scan.l
@@ -1,5 +1,5 @@
---- compiler/scan.l.orig Tue Nov 23 04:47:01 2004
-+++ compiler/scan.l Thu Apr 14 18:46:07 2005
+--- compiler/scan.l.orig Thu Jul 21 14:57:46 2005
++++ compiler/scan.l Thu Jan 19 21:08:45 2006
@@ -24,7 +24,6 @@
*/
@@ -8,7 +8,7 @@
#include "htglobals.h"
#include <ctype.h>
-@@ -91,6 +90,7 @@
+@@ -93,6 +92,7 @@
#include "htcoboly.h"
#include "htcobol.tab.h" /* definitions from YACC */
diff --git a/lang/tinycobol/files/patch-configure b/lang/tinycobol/files/patch-configure
new file mode 100644
index 000000000000..97647454b7b9
--- /dev/null
+++ b/lang/tinycobol/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Thu Jul 21 14:57:45 2005
++++ configure Thu Jan 19 22:17:40 2006
+@@ -3806,6 +3806,7 @@
+ s%@tcobpp_version@%$tcobpp_version%g
+ s%@htg_ld_args_m@%$htg_ld_args_m%g
+ s%@htg_ld_args_db@%$htg_ld_args_db%g
++s%@htg_ld_args_readline@%$htg_ld_args_readline%g
+ s%@asx_cmd@%$asx_cmd%g
+ s%@ccx_cmd@%$ccx_cmd%g
+ s%@ranlibx_cmd@%$ranlibx_cmd%g
diff --git a/lang/tinycobol/files/patch-lib_Makefile.in b/lang/tinycobol/files/patch-lib_Makefile.in
new file mode 100644
index 000000000000..888c9027fb1e
--- /dev/null
+++ b/lang/tinycobol/files/patch-lib_Makefile.in
@@ -0,0 +1,26 @@
+--- lib/Makefile.in.orig Thu Jul 21 14:57:47 2005
++++ lib/Makefile.in Thu Jan 19 22:19:28 2006
+@@ -32,7 +32,7 @@
+ GREP = grep -v
+
+ MAKEDEPEND=@MAKEDEPEND@
+-LIBS=-ldl @htg_ld_args_m@ @htg_ld_args_db@ -lncurses
++LIBS=@htg_ld_args_m@ @htg_ld_args_db@ -lncurses
+ #
+ # Default install directory is set in htconfig.h
+ #
+@@ -113,12 +113,12 @@
+ # Rules for building the shared library
+ #
+ ${SHARED_LIB1}: ${OBJD1}
+- ${CCX} -shared -Wl,-soname,lib${lib_name1}.so.0 -o ${SHARED_LIB1} $(OBJD1) ${LIBS}
++ ${CCX} @LDFLAGS@ -shared -Wl,-soname,lib${lib_name1}.so.0 -o ${SHARED_LIB1} $(OBJD1) ${LIBS}
+ ${LNK} $(SHARED_LIB1) lib$(lib_name1).so.0
+ ${LNK} $(SHARED_LIB1) lib$(lib_name1).so
+
+ ${SHARED_LIB2}: ${OBJD2}
+- ${CCX} -shared -Wl,-soname,lib${lib_name2}.so.0 -o ${SHARED_LIB2} $(OBJD2) ${LIBS}
++ ${CCX} @LDFLAGS@ -shared -Wl,-soname,lib${lib_name2}.so.0 -o ${SHARED_LIB2} $(OBJD2) ${LIBS}
+ ${LNK} $(SHARED_LIB2) lib$(lib_name2).so.0
+ ${LNK} $(SHARED_LIB2) lib$(lib_name2).so
+