diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /frozen-bubble | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'frozen-bubble')
| -rw-r--r-- | frozen-bubble/Makefile.PL.patch | 26 | ||||
| -rw-r--r-- | frozen-bubble/Makefile.patch | 16 |
2 files changed, 42 insertions, 0 deletions
diff --git a/frozen-bubble/Makefile.PL.patch b/frozen-bubble/Makefile.PL.patch index e69de29bb2..5f7829f753 100644 --- a/frozen-bubble/Makefile.PL.patch +++ b/frozen-bubble/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/frozen-bubble/Makefile.patch b/frozen-bubble/Makefile.patch index e69de29bb2..60844a735b 100644 --- a/frozen-bubble/Makefile.patch +++ b/frozen-bubble/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: |