fix build for bsd make, dev release 1.443_3

PerlGameDev · May 4, 2014 · 671a6e8 · 671a6e8
1 parent 72af87c
commit 671a6e8
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -5,6 +5,9 @@ Versioning rule: public releases are even numbers, dev releases are odd. (same l
 TODO
      - check for available libs when using --with-sdl-config option
 
+1.443_3 Sun May 04 2014
+     - add patch that replaces $^ in Makefile.in, which can be a problem for BSD's make [FROGGS]
+
 1.443_2 Wed Apr 24 2014
      - let SDL_Pango.h include ft2build.h, because even when the header file ifdef's out some
        code that needs it, the source file does not and thus explodes happily. [FROGGS]

diff --git a/MANIFEST b/MANIFEST
@@ -24,6 +24,7 @@ patches/SDL-1.2.14-openbsd-rldflags.patch
 patches/SDL-1.2.14-SDL_platform_h.patch
 patches/SDL-1.2.14-SDL_x11gl_c.patch
 patches/SDL-1.2.14-video_mmx.patch
+patches/SDL-1.2.15-Makefile.in-OBJECTS.patch
 patches/SDL-1.2.15-openbsd-rldflags.patch
 patches/SDL-1.2.15-PIC-in-CFLAGS.patch
 patches/SDL_config_win32.h

diff --git a/README b/README
@@ -2,7 +2,7 @@ NAME
     Alien::SDL - building, finding and using SDL binaries
 
 VERSION
-    Version 1.443_2
+    Version 1.443_3
 
 SYNOPSIS
     Alien::SDL tries (in given order) during its installation:

diff --git a/inc/My/Utility.pm b/inc/My/Utility.pm
@@ -193,6 +193,7 @@ our $source_packs = [
           'libsdl-1.2.15-const-xdata32.3.patch',
           'libsdl-1.2.15-const-xdata32.4.patch',
           'SDL-1.2.15-PIC-in-CFLAGS.patch',
+          'SDL-1.2.15-Makefile.in-OBJECTS.patch',
         ],
         prereqs => {
           libs => [

diff --git a/lib/Alien/SDL.pm b/lib/Alien/SDL.pm
@@ -16,11 +16,11 @@ Alien::SDL - building, finding and using SDL binaries
 
 =head1 VERSION
 
-Version 1.443_2
+Version 1.443_3
 
 =cut
 
-our $VERSION = '1.443_2';
+our $VERSION = '1.443_3';
 $VERSION = eval $VERSION;
 
 =head1 SYNOPSIS

diff --git a/patches/SDL-1.2.15-Makefile.in-OBJECTS.patch b/patches/SDL-1.2.15-Makefile.in-OBJECTS.patch
@@ -0,0 +1,15 @@
+--- SDL-1.2/Makefile.in	2012-05-28 13:21:48.000000000 +0200
++++ SDL-1.2/Makefile.in.new	2014-05-04 20:07:10.000000000 +0200
+@@ -72,10 +72,10 @@
+ include $(depend)
+
+ $(objects)/$(TARGET): $(OBJECTS)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
+
+
+ install: all install-bin install-hdrs install-lib install-data install-man