projects / vuplus_openembedded / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9951a83)
frozen-bubble: put the patches into their own dir
authorwoglinde <heinold@inf.fu-berlin.de>
Tue, 6 Jan 2009 22:49:02 +0000 (23:49 +0100)
committerwoglinde <heinold@inf.fu-berlin.de>
Tue, 6 Jan 2009 22:49:02 +0000 (23:49 +0100)
packages/frozen-bubble/Makefile.PL.patch [deleted file] patch | blob | history
packages/frozen-bubble/Makefile.patch [deleted file] patch | blob | history
packages/frozen-bubble/Makefile_top.patch [deleted file] patch | blob | history
packages/frozen-bubble/frozen-bubble-1.0.0/Makefile.PL.patch [new file with mode: 0644] patch | blob
packages/frozen-bubble/frozen-bubble-1.0.0/Makefile.patch [new file with mode: 0644] patch | blob
packages/frozen-bubble/frozen-bubble-1.0.0/Makefile_top.patch [new file with mode: 0644] patch | blob

diff --git a/packages/frozen-bubble/Makefile.PL.patch b/packages/frozen-bubble/Makefile.PL.patch
deleted file mode 100644 (file)
index 5f7829f..0000000
--- a/packages/frozen-bubble/Makefile.PL.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- frozen-bubble/c_stuff/Makefile.PL.old      2004-06-25 19:51:53.000000000 +0100
-+++ frozen_bubble/c_stuff/Makefile.PL  2004-06-25 20:07:43.000000000 +0100
-@@ -16,8 +16,8 @@
- }
- EOTEST
-       close(CTEST);
--      $r = system("$Config{cc} -o $fname $fname.c $cflags $libs 2>/dev/null 1>/dev/null");
--      warn("RUNNING: $Config{cc} -o $fname $fname.c $cflags $libs\n") if $ENV{VERBOSE};
-+      $r = system("$ENV{CC} $ENV{CFLAGS} $ENV{LDFLAGS} -o $fname $fname.c $cflags $libs 2>/dev/null 1>/dev/null");
-+      warn("RUNNING: $ENV{CC} $ENV{CFLAGS} $ENV{LDFLAGS} -o $fname $fname.c $cflags $libs\n") if $ENV{VERBOSE};
-       unlink($fname, "$fname.c");
-       return $r == 0;
- }
-@@ -51,10 +51,10 @@
- 
- WriteMakefile(
-     'NAME'         => 'fb_c_stuff',
--    'LIBS'         => [ chomp_(`sdl-config --libs`) . ' -lSDL_mixer'],
-+    'LIBS'         => [ $ENV{LDFLAGS} . " " . chomp_(`sdl-config --libs`) . ' -lSDL_mixer'],
-     'VERSION_FROM' => 'fb_c_stuff.pm', # finds VERSION
-     'OBJECT'       => 'fb_c_stuff.o',
--    'INC'          => chomp_(`sdl-config --cflags`) . ' -I.',
-+    'INC'          => $ENV{CFLAGS} . " " . chomp_(`sdl-config --cflags`) . ' -I.',
-     'OPTIMIZE'     => '-O2 -Wall',
-     'MAKEFILE'     => 'Makefile_c',
- );
diff --git a/packages/frozen-bubble/Makefile.patch b/packages/frozen-bubble/Makefile.patch
deleted file mode 100644 (file)
index 60844a7..0000000
--- a/packages/frozen-bubble/Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- frozen-bubble/c_stuff/Makefile.old 2004-06-25 20:04:03.000000000 +0100
-+++ frozen-bubble/c_stuff/Makefile     2004-06-25 20:07:25.000000000 +0100
-@@ -1,11 +1,11 @@
- .PHONY: clean
- 
- fb_c_stuff: %: %.xs
--      test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
-+      test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) CC="$(CC)" LD="$(LD)"
-       $(MAKE) -f Makefile_c
- 
- install:
--      test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
-+      test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) CC="$(CC)" LD="$(LD)"
-       $(MAKE) -f Makefile_c install
- 
- clean:
diff --git a/packages/frozen-bubble/Makefile_top.patch b/packages/frozen-bubble/Makefile_top.patch
deleted file mode 100644 (file)
index 60071c3..0000000
--- a/packages/frozen-bubble/Makefile_top.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- frozen-bubble/Makefile.old 2005-02-24 20:55:27.000000000 +0100
-+++ frozen-bubble/Makefile     2005-02-24 20:58:53.000000000 +0100
-@@ -8,8 +8,8 @@
- all: dirs
- 
- dirs:
--      @if ! perl -e 'use SDL'; then echo -e "\n    *** I need perl-SDL installed"; false; fi
--      @if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 1 if $$mj<1 || $$mn<19'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
-+#     @if ! perl -e 'use SDL'; then echo -e "\n    *** I need perl-SDL installed"; false; fi
-+#     @if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 1 if $$mj<1 || $$mn<19'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
-       @for n in . $(DIRS); do \
-               [ "$$n" = "." ] || $(MAKE) -C $$n ;\
-       done
diff --git a/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile.PL.patch b/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile.PL.patch
new file mode 100644 (file)
index 0000000..5f7829f
--- /dev/null
+++ b/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile.PL.patch
@@ -0,0 +1,26 @@
+--- frozen-bubble/c_stuff/Makefile.PL.old      2004-06-25 19:51:53.000000000 +0100
++++ frozen_bubble/c_stuff/Makefile.PL  2004-06-25 20:07:43.000000000 +0100
+@@ -16,8 +16,8 @@
+ }
+ EOTEST
+       close(CTEST);
+-      $r = system("$Config{cc} -o $fname $fname.c $cflags $libs 2>/dev/null 1>/dev/null");
+-      warn("RUNNING: $Config{cc} -o $fname $fname.c $cflags $libs\n") if $ENV{VERBOSE};
++      $r = system("$ENV{CC} $ENV{CFLAGS} $ENV{LDFLAGS} -o $fname $fname.c $cflags $libs 2>/dev/null 1>/dev/null");
++      warn("RUNNING: $ENV{CC} $ENV{CFLAGS} $ENV{LDFLAGS} -o $fname $fname.c $cflags $libs\n") if $ENV{VERBOSE};
+       unlink($fname, "$fname.c");
+       return $r == 0;
+ }
+@@ -51,10 +51,10 @@
+ 
+ WriteMakefile(
+     'NAME'         => 'fb_c_stuff',
+-    'LIBS'         => [ chomp_(`sdl-config --libs`) . ' -lSDL_mixer'],
++    'LIBS'         => [ $ENV{LDFLAGS} . " " . chomp_(`sdl-config --libs`) . ' -lSDL_mixer'],
+     'VERSION_FROM' => 'fb_c_stuff.pm', # finds VERSION
+     'OBJECT'       => 'fb_c_stuff.o',
+-    'INC'          => chomp_(`sdl-config --cflags`) . ' -I.',
++    'INC'          => $ENV{CFLAGS} . " " . chomp_(`sdl-config --cflags`) . ' -I.',
+     'OPTIMIZE'     => '-O2 -Wall',
+     'MAKEFILE'     => 'Makefile_c',
+ );
diff --git a/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile.patch b/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile.patch
new file mode 100644 (file)
index 0000000..60844a7
--- /dev/null
+++ b/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile.patch
@@ -0,0 +1,16 @@
+--- frozen-bubble/c_stuff/Makefile.old 2004-06-25 20:04:03.000000000 +0100
++++ frozen-bubble/c_stuff/Makefile     2004-06-25 20:07:25.000000000 +0100
+@@ -1,11 +1,11 @@
+ .PHONY: clean
+ 
+ fb_c_stuff: %: %.xs
+-      test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
++      test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) CC="$(CC)" LD="$(LD)"
+       $(MAKE) -f Makefile_c
+ 
+ install:
+-      test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
++      test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) CC="$(CC)" LD="$(LD)"
+       $(MAKE) -f Makefile_c install
+ 
+ clean:
diff --git a/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile_top.patch b/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile_top.patch
new file mode 100644 (file)
index 0000000..60071c3
--- /dev/null
+++ b/packages/frozen-bubble/frozen-bubble-1.0.0/Makefile_top.patch
@@ -0,0 +1,13 @@
+--- frozen-bubble/Makefile.old 2005-02-24 20:55:27.000000000 +0100
++++ frozen-bubble/Makefile     2005-02-24 20:58:53.000000000 +0100
+@@ -8,8 +8,8 @@
+ all: dirs
+ 
+ dirs:
+-      @if ! perl -e 'use SDL'; then echo -e "\n    *** I need perl-SDL installed"; false; fi
+-      @if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 1 if $$mj<1 || $$mn<19'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
++#     @if ! perl -e 'use SDL'; then echo -e "\n    *** I need perl-SDL installed"; false; fi
++#     @if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 1 if $$mj<1 || $$mn<19'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
+       @for n in . $(DIRS); do \
+               [ "$$n" = "." ] || $(MAKE) -C $$n ;\
+       done
openembedded 1.6 repository.