* [gentoo-commits] gentoo-x86 commit in dev-lang/squirrel/files: squirrel-2.2.4-autotools.patch
@ 2010-04-13 17:49 Markos Chandras (hwoarang)
0 siblings, 0 replies; only message in thread
From: Markos Chandras (hwoarang) @ 2010-04-13 17:49 UTC (permalink / raw
To: gentoo-commits
hwoarang 10/04/13 17:49:42
Modified: squirrel-2.2.4-autotools.patch
Log:
Fixes bug 314497 and other fixes. Thanks to Nathan Phillip Brink (ohnobinki)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch?r1=1.1&r2=1.2
Index: squirrel-2.2.4-autotools.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squirrel-2.2.4-autotools.patch 5 Mar 2010 18:45:32 -0000 1.1
+++ squirrel-2.2.4-autotools.patch 13 Apr 2010 17:49:42 -0000 1.2
@@ -1,4 +1,9 @@
-diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile
+Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Purpose: Makes squirrel buildable and installable using autotools, a buildsystem everybody is comfortable with.
+Source: http://ohnopub.net/hg/SQUIRREL2
+Generate with: hg diff -r 0 -r -1 -I '**Makefile*' -I configure.ac -I '**.in'
+
+diff -r d6d89bbc08e5 -r c89309f5be40 Makefile
--- a/Makefile Thu Feb 11 15:08:35 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
@@ -20,22 +25,25 @@
- cd squirrel; $(MAKE) sq64
- cd sqstdlib; $(MAKE) sq64
- cd sq; $(MAKE) sq64
-diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile.am
+diff -r d6d89bbc08e5 -r c89309f5be40 Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/Makefile.am Wed Feb 17 01:30:01 2010 -0500
-@@ -0,0 +1,84 @@
++++ b/Makefile.am Sat Apr 10 11:25:40 2010 -0400
+@@ -0,0 +1,89 @@
+# autoreconf variables, recommended by libtoolize
+ACLOCAL_FLAGS = -I m4
+
-+AM_CPPFLAGS = -Iinclude
++AM_CPPFLAGS = -I$(top_srcdir)/include
+
+# custom installation directories
+examplesdir = $(docdir)/examples
+pkgconfigdir = $(libdir)/pkgconfig
+
+# installed things
++if ENABLE_DOC
+dist_doc_DATA = doc/sqstdlib2.pdf \
+ doc/squirrel2.pdf
++endif
++if ENABLE_EXAMPLES
+dist_examples_DATA = samples/ackermann.nut \
+ samples/array.nut \
+ samples/class.nut \
@@ -52,6 +60,8 @@
+ samples/metamethods.nut \
+ samples/methcall.nut \
+ samples/tailstate.nut
++endif
++
+nodist_pkgconfig_DATA = libsqstdlib.pc \
+ libsquirrel.pc
+bin_PROGRAMS = sq/sq
@@ -108,10 +118,10 @@
+ doc/sqstdlib2.chm doc/squirrel2.chm \
+ squirrel.dsw sq/sq.dsp squirrel/squirrel.dsp sqstdlib/sqstdlib.dsp \
+ etc/minimal.c etc/test.nut
-diff -r d6d89bbc08e5 -r 2ef7f06a679f configure.ac
+diff -r d6d89bbc08e5 -r c89309f5be40 configure.ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/configure.ac Wed Feb 17 01:30:01 2010 -0500
-@@ -0,0 +1,15 @@
++++ b/configure.ac Sat Apr 10 11:25:40 2010 -0400
+@@ -0,0 +1,29 @@
+AC_INIT([squirrel],[2.2.4],[http://squirrel-lang.org/])
+
+# recommended by libtoolize:
@@ -123,13 +133,27 @@
+AC_PROG_CC_C_O
+AC_PROG_CXX
+
++AC_ARG_ENABLE([doc],
++ [AS_HELP_STRING([--disable-doc], [Control whether or not the API docs (pdfs) are installed.])],
++ [enable_docs=$enableval],
++ [enable_docs=yes])
++AM_CONDITIONAL([ENABLE_DOC],
++ [test "x$enable_docs" = "xyes"])
++
++AC_ARG_ENABLE([examples],
++ [AS_HELP_STRING([--disable-exampels], [Control whether or not examples of libsquirrel use are installed.])],
++ [enable_examples=$enableval],
++ [enable_examples=yes])
++AM_CONDITIONAL([ENABLE_EXAMPLES],
++ [test "x$enable_examples" = "xyes"])
++
+AC_CONFIG_FILES([Makefile
+libsquirrel.pc
+libsqstdlib.pc])
+AC_OUTPUT
-diff -r d6d89bbc08e5 -r 2ef7f06a679f libsqstdlib.pc.in
+diff -r d6d89bbc08e5 -r c89309f5be40 libsqstdlib.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/libsqstdlib.pc.in Wed Feb 17 01:30:01 2010 -0500
++++ b/libsqstdlib.pc.in Sat Apr 10 11:25:40 2010 -0400
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -145,9 +169,9 @@
+# dependency so it's justified.
+Libs.private: -lsquirrel
+Cflags: -I${includedir}
-diff -r d6d89bbc08e5 -r 2ef7f06a679f libsquirrel.pc.in
+diff -r d6d89bbc08e5 -r c89309f5be40 libsquirrel.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/libsquirrel.pc.in Wed Feb 17 01:30:01 2010 -0500
++++ b/libsquirrel.pc.in Sat Apr 10 11:25:40 2010 -0400
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -160,7 +184,7 @@
+URL: @PACKAGE_BUGREPORT@
+Libs: -L${libdir} -lsquirrel
+Cflags: -I${includedir}
-diff -r d6d89bbc08e5 -r 2ef7f06a679f sq/Makefile
+diff -r d6d89bbc08e5 -r c89309f5be40 sq/Makefile
--- a/sq/Makefile Thu Feb 11 15:08:35 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
@@ -186,7 +210,7 @@
-sq64:
- g++ -O2 -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
\ No newline at end of file
-diff -r d6d89bbc08e5 -r 2ef7f06a679f sqstdlib/Makefile
+diff -r d6d89bbc08e5 -r c89309f5be40 sqstdlib/Makefile
--- a/sqstdlib/Makefile Thu Feb 11 15:08:35 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
@@ -220,7 +244,7 @@
- gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ)
- ar rc $(OUT) *.o
- rm *.o
-diff -r d6d89bbc08e5 -r 2ef7f06a679f squirrel/Makefile
+diff -r d6d89bbc08e5 -r c89309f5be40 squirrel/Makefile
--- a/squirrel/Makefile Thu Feb 11 15:08:35 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-04-13 17:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-13 17:49 [gentoo-commits] gentoo-x86 commit in dev-lang/squirrel/files: squirrel-2.2.4-autotools.patch Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox