summaryrefslogtreecommitdiff
path: root/m5475-atari-mint/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'm5475-atari-mint/recipes')
-rw-r--r--m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p39
-rw-r--r--m5475-atari-mint/recipes/patches/mintlib/configvars.p35
-rw-r--r--m5475-atari-mint/recipes/patches/mintlib/posix_regex.p11
3 files changed, 48 insertions, 37 deletions
diff --git a/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p b/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
index 5692a21..f65dc89 100644
--- a/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
+++ b/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
@@ -1,29 +1,28 @@
---- CONFIGVARS.orig 2012-10-11 17:55:52.000000000 +0100
-+++ CONFIGVARS 2012-10-11 17:56:37.000000000 +0100
-@@ -1,8 +1,8 @@
- #
- #
+--- CONFIGVARS 2011-05-13 23:38:45.000000000 +0100
++++ CONFIGVARS 2011-05-13 23:40:11.000000000 +0100
+@@ -3,6 +3,7 @@
# cross compiling
--#CROSS = yes
--CROSS = no
+ #CROSS = yes
+ #CROSS = no
+CROSS = yes
-+#CROSS = no
- #
- # build alternate libraries for processor variants
-@@ -15,13 +15,13 @@
#
+ # cross compiling
+@@ -33,7 +34,7 @@
+ CROSS := yes
+ else
ifeq ($(CROSS),yes)
-
--CROSSPREFIX=m68k-atari-mint-
-+CROSSPREFIX=m5475-atari-mint-
-
- NATIVECC = gcc
+- CROSS_TOOL=m68k-atari-mint
++ CROSS_TOOL=m5475-atari-mint
+ CROSSPREFIX=$(CROSS_TOOL)-
+ else
+ CROSSPREFIX=
+@@ -46,7 +47,7 @@
NATIVECFLAGS = -O
CRLF = echo crlf -s
--PREFIX=/usr/m68k-atari-mint
+-PREFIX=$(shell $(CROSSPREFIX)gcc -print-sysroot)/usr
+PREFIX=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint
-
- else
-
+ ifeq ($(PREFIX),)
+ PREFIX=/usr/$(CROSS_TOOL)
+ endif
diff --git a/m5475-atari-mint/recipes/patches/mintlib/configvars.p b/m5475-atari-mint/recipes/patches/mintlib/configvars.p
index f72d6f4..803272a 100644
--- a/m5475-atari-mint/recipes/patches/mintlib/configvars.p
+++ b/m5475-atari-mint/recipes/patches/mintlib/configvars.p
@@ -1,6 +1,6 @@
--- ./configvars.orig 2012-05-03 19:26:10.000000000 +0200
-+++ ./configvars 2012-11-05 23:03:52.000000000 +0100
-@@ -12,14 +12,14 @@
++++ ./configvars 2012-11-05 22:34:07.000000000 +0100
+@@ -12,7 +12,7 @@
# get installed. You have to take car yourself that the libraries
# and include files and so on will get installed in the right place
# The easiest way to do this is to change "prefix", see below.
@@ -9,29 +9,30 @@
# Silent build or verbose
AM_DEFAULT_VERBOSITY = 1
-
- # Define this to "m68k-atari-mint-" if you cross compile.
+@@ -35,7 +35,7 @@
+ CROSS := yes
+ else
ifeq ($(CROSS),yes)
-- toolprefix=m68k-atari-mint-
-+ toolprefix=m5475-atari-mint-
+- CROSS_TOOL=m68k-atari-mint
++ CROSS_TOOL=m5475-atari-mint
+ toolprefix=$(CROSS_TOOL)-
else
toolprefix=
- endif
-@@ -47,7 +47,7 @@
+@@ -64,7 +64,7 @@
+ # This variable is used for various others. Change its value if
# need be. When cross-compiling you will usually want to set this
# to "/usr/m68k-atari-mint".
- ifeq ($(CROSS),yes)
-- prefix=/usr/m68k-atari-mint
-+ prefix=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint
- else
- prefix=/usr
- endif
-@@ -124,7 +124,7 @@
- CFLAGS=-O2 -fomit-frame-pointer
+-prefix=/usr
++prefix=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint
+
+ # This is where include files get installed.
+ includedir=${prefix}/include
+@@ -141,7 +141,7 @@
+ LDFLAGS=
# Additional defines.
-DEFS=
+DEFS=-DREGEX_MALLOC
# Define this to the warning level you want.
- WARN=-Wall
+ WARN=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wold-style-declaration -Wold-style-definition
diff --git a/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p b/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p
new file mode 100644
index 0000000..6a42a40
--- /dev/null
+++ b/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p
@@ -0,0 +1,11 @@
+--- ./posix/regex.c.orig 2012-05-03 19:26:10.000000000 +0200
++++ ./posix/regex.c 2012-11-05 22:34:07.000000000 +0100
+@@ -1364,6 +1364,7 @@
+ \
+ DEBUG_PRINT2 (" Pushing failure id: %u\n", failure_id); \
+ DEBUG_PUSH (failure_id); \
++ (void) destination; \
+ } while (0)
+
+ /* This is the number of items that are pushed and popped on the stack
+