[Armadeus-commitlog] SF.net SVN: armadeus: [691] trunk

[<ar...@us...>]

Revision: 691
          http://armadeus.svn.sourceforge.net/armadeus/?rev=691&view=rev
Author:   artemys
Date:     2007-11-17 08:13:10 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
[BUILDROOT] Makes SDL_xxx compile correctly (2nd try ;-) )

Modified Paths:
--------------
    trunk/buildroot/package/sdl/sdl_net.mk

Added Paths:
-----------
    trunk/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch

Removed Paths:
-------------
    trunk/patches/033-buildroot-make-sdl-config-generated-as-needed-for-sdl_image.diff

Added: trunk/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
===================================================================
--- trunk/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch	                        (rev 0)
+++ trunk/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch	2007-11-17 16:13:10 UTC (rev 691)
@@ -0,0 +1,15 @@
+--- SDL-1.2.11.org/sdl-config.in	2007-11-17 16:43:59.000000000 +0100
++++ SDL-1.2.11/sdl-config.in	2007-11-17 16:45:31.000000000 +0100
+@@ -41,10 +41,10 @@
+       echo @SDL_VERSION@
+       ;;
+     --cflags)
+-      echo -I@includedir@/SDL @SDL_CFLAGS@
++      echo -I$STAGING_DIR/include/SDL @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+-@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++@ENABLE_SHARED_TRUE@      echo -L$STAGING_DIR/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)

Modified: trunk/buildroot/package/sdl/sdl_net.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl_net.mk	2007-11-17 14:08:22 UTC (rev 690)
+++ trunk/buildroot/package/sdl/sdl_net.mk	2007-11-17 16:13:10 UTC (rev 691)
@@ -6,7 +6,7 @@
 SDL_NET_VERSION:=1.2.6
 SDL_NET_SOURCE:=SDL_net-$(SDL_NET_VERSION).tar.gz
 SDL_NET_SITE:=http://www.libsdl.org/projects/SDL_net/release
-SDL_NET_CAT:=zcat
+SDL_NET_CAT:=$(ZCAT)
 SDL_NET_DIR:=$(BUILD_DIR)/SDL_net-$(SDL_NET_VERSION)
 
 $(DL_DIR)/$(SDL_NET_SOURCE):
@@ -16,13 +16,13 @@
 
 $(SDL_NET_DIR)/.unpacked: $(DL_DIR)/$(SDL_NET_SOURCE)
 	$(SDL_NET_CAT) $(DL_DIR)/$(SDL_NET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(CONFIG_UPDATE) $(SDL_NET_DIR)
 	touch $@
 
 $(SDL_NET_DIR)/.configured: $(SDL_NET_DIR)/.unpacked
-	(cd $(SDL_NET_DIR); \
+	(cd $(SDL_NET_DIR); rm -rf config.cache; \
 	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) " \
-	LDFLAGS="-Wl,-rpath=$(STAGING_DIR)/lib/" \
+	$(TARGET_CONFIGURE_ARGS) \
 	./configure \
 	--target=$(GNU_TARGET_NAME) \
 	--host=$(GNU_TARGET_NAME) \

Deleted: trunk/patches/033-buildroot-make-sdl-config-generated-as-needed-for-sdl_image.diff
===================================================================
--- trunk/patches/033-buildroot-make-sdl-config-generated-as-needed-for-sdl_image.diff	2007-11-17 14:08:22 UTC (rev 690)
+++ trunk/patches/033-buildroot-make-sdl-config-generated-as-needed-for-sdl_image.diff	2007-11-17 16:13:10 UTC (rev 691)
@@ -1,11 +0,0 @@
---- buildrootref/package/sdl/sdl.mk	2007-11-15 20:35:15.000000000 +0100
-+++ buildroot/package/sdl/sdl.mk	2007-11-15 20:35:05.000000000 +0100
-@@ -40,7 +40,7 @@
- 		--sysconfdir=/etc \
- 		--datadir=/share \
- 		--localstatedir=/var \
--		--includedir=/include \
-+		--includedir=$(STAGING_DIR)/include \
- 		--mandir=/man \
- 		--infodir=/info \
- 		--disable-arts \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.