diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-10 10:57:52 +0000 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-10 10:57:52 +0000 |
| commit | 0c5c03d095485f7521d96cd44314f9a0ee826232 (patch) | |
| tree | 1df111a8270ba417537931cc6e1a4952b3000ee9 /patches/SDL-1.2.13/generic | |
| parent | d3ee0775cadf505c4bae7b1df483d73bf8294815 (diff) | |
| download | ptxdist-0c5c03d095485f7521d96cd44314f9a0ee826232.tar.gz ptxdist-0c5c03d095485f7521d96cd44314f9a0ee826232.tar.xz | |
* patches: remove 'generic'-layer
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10711 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/SDL-1.2.13/generic')
| -rw-r--r-- | patches/SDL-1.2.13/generic/SDL-1.2.10-sdl-config.in.diff | 48 | ||||
| -rw-r--r-- | patches/SDL-1.2.13/generic/fix-parallel-build.diff | 23 | ||||
| -rw-r--r-- | patches/SDL-1.2.13/generic/series | 2 |
3 files changed, 0 insertions, 73 deletions
diff --git a/patches/SDL-1.2.13/generic/SDL-1.2.10-sdl-config.in.diff b/patches/SDL-1.2.13/generic/SDL-1.2.10-sdl-config.in.diff deleted file mode 100644 index 29e4b965c..000000000 --- a/patches/SDL-1.2.13/generic/SDL-1.2.10-sdl-config.in.diff +++ /dev/null @@ -1,48 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Subject teach sdl-config about sysroot - -Teach sdl-config the concept of sysroot, but disable manual prefix overwriting. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> - ---- - sdl-config.in | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -Index: SDL-1.2.13/sdl-config.in -=================================================================== ---- SDL-1.2.13.orig/sdl-config.in -+++ SDL-1.2.13/sdl-config.in -@@ -23,10 +23,10 @@ while test $# -gt 0; do - - case $1 in - --prefix=*) -- prefix=$optarg -- if test $exec_prefix_set = no ; then -- exec_prefix=$optarg -- fi -+# prefix=$optarg -+# if test $exec_prefix_set = no ; then -+# exec_prefix=$optarg -+# fi - ;; - --prefix) - echo $prefix -@@ -42,14 +42,14 @@ while test $# -gt 0; do - echo @SDL_VERSION@ - ;; - --cflags) -- echo -I@includedir@/SDL @SDL_CFLAGS@ -+ echo -I${SYSROOT}@includedir@/SDL @SDL_CFLAGS@ - ;; - @ENABLE_SHARED_TRUE@ --libs) --@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ -+@ENABLE_SHARED_TRUE@ echo -L${SYSROOT}@libdir@ @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) --@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ -+@ENABLE_STATIC_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ - @ENABLE_STATIC_TRUE@ ;; - *) - echo "${usage}" 1>&2 diff --git a/patches/SDL-1.2.13/generic/fix-parallel-build.diff b/patches/SDL-1.2.13/generic/fix-parallel-build.diff deleted file mode 100644 index 7df52245c..000000000 --- a/patches/SDL-1.2.13/generic/fix-parallel-build.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Subject: fix parallel build - -We have to create the objects dir before saving gcc's output into it. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: SDL-1.2.13/Makefile.in -=================================================================== ---- SDL-1.2.13.orig/Makefile.in -+++ SDL-1.2.13/Makefile.in -@@ -75,7 +75,7 @@ depend: - - include $(depend) - --$(objects)/$(TARGET): $(OBJECTS) -+$(objects)/$(TARGET): $(OBJECTS) $(objects) - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - - $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) diff --git a/patches/SDL-1.2.13/generic/series b/patches/SDL-1.2.13/generic/series deleted file mode 100644 index fa460d8dd..000000000 --- a/patches/SDL-1.2.13/generic/series +++ /dev/null @@ -1,2 +0,0 @@ -SDL-1.2.10-sdl-config.in.diff -fix-parallel-build.diff |