diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /frozen-bubble | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'frozen-bubble')
| -rw-r--r-- | frozen-bubble/Makefile.PL.patch | 26 | ||||
| -rw-r--r-- | frozen-bubble/Makefile.patch | 16 | ||||
| -rw-r--r-- | frozen-bubble/frozen-bubble_1.0.0.bb | 0 |
3 files changed, 0 insertions, 42 deletions
diff --git a/frozen-bubble/Makefile.PL.patch b/frozen-bubble/Makefile.PL.patch deleted file mode 100644 index 5f7829f753..0000000000 --- a/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/frozen-bubble/Makefile.patch b/frozen-bubble/Makefile.patch deleted file mode 100644 index 60844a735b..0000000000 --- a/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/frozen-bubble/frozen-bubble_1.0.0.bb b/frozen-bubble/frozen-bubble_1.0.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/frozen-bubble/frozen-bubble_1.0.0.bb +++ /dev/null |