summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2008-04-14 17:52:08 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2008-04-14 17:52:08 +0000
commitf4abe8f6d22340aca45ab28e9d9f928eee291f1c (patch)
tree079d4e4b50abd7b6b8c1985cf01688b3a83317fe /patches
parent6e80395d52c4a26c1349e6d6aa8412d8b3b98069 (diff)
downloadptxdist-f4abe8f6d22340aca45ab28e9d9f928eee291f1c.tar.gz
ptxdist-f4abe8f6d22340aca45ab28e9d9f928eee291f1c.tar.xz
* libpng-1.2.8-config:
obsolete git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7984 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r--patches/libpng-1.2.8-config/generic/Makefile_am_destdir.diff55
-rw-r--r--patches/libpng-1.2.8-config/generic/Makefile_am_libpng_config.diff34
-rw-r--r--patches/libpng-1.2.8-config/generic/Makefile_in_destdir.diff55
-rw-r--r--patches/libpng-1.2.8-config/generic/Makefile_in_libpng_config.diff34
-rw-r--r--patches/libpng-1.2.8-config/generic/series4
5 files changed, 0 insertions, 182 deletions
diff --git a/patches/libpng-1.2.8-config/generic/Makefile_am_destdir.diff b/patches/libpng-1.2.8-config/generic/Makefile_am_destdir.diff
deleted file mode 100644
index dfb8f6ea2..000000000
--- a/patches/libpng-1.2.8-config/generic/Makefile_am_destdir.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Submitted-By: Marc Kleine-Budde, 2006-02-09
-# Committed-By: Marc Kleine-Budde
-#
-# Error:
-#
-# libtool: install: warning: remember to run `libtool --finish /usr/lib'
-# cat ./scripts/libpng.pc.in | \
-# sed -e 's,[@]PREFIX[@],/usr,' -e 's,[@]INCLUDEDIR[@],/usr/include,' > libpng.pc
-# cp libpng.pc libpng12.pc
-# /usr/bin/install -c -d /usr/lib/pkgconfig
-# /usr/bin/install -c -m 644 libpng.pc /usr/lib/pkgconfig
-# /usr/bin/install: cannot remove `/usr/lib/pkgconfig/libpng.pc': Permission denied
-# make[2]: *** [install-data-local] Error 1
-# make[2]: Leaving directory `/home/mkl/pengutronix/pii/ptxdist-build/build-target/libpng-1.2.8-config'
-# make[1]: *** [install-am] Error 2
-# make[1]: Leaving directory `/home/mkl/pengutronix/pii/ptxdist-build/build-target/libpng-1.2.8-config'
-# make: *** [/home/mkl/pengutronix/pii/ptxdist-build/state/libpng.install] Error 2
-#
-# Description:
-#
-# the installation of libpng.pc fails, because DESTDIR is not
-# honoured
-#
-# State:
-#
-# BUG: 1285794 on libpng's bugtracket on sf.net
-#
-# bug remains open :(
-#
-# http://sourceforge.net/tracker/?group_id=5624&atid=105624&func=detail&aid=1285794
-#
-Index: libpng-1.2.8-config/Makefile.am
-===================================================================
---- libpng-1.2.8-config.orig/Makefile.am
-+++ libpng-1.2.8-config/Makefile.am
-@@ -45,13 +45,13 @@ libpng12.pc: libpng.pc
- cp libpng.pc libpng12.pc
-
- install-data-local: libpng.pc libpng12.pc
-- @INSTALL@ -d @PKGCONFIGDIR@
-- @INSTALL_DATA@ libpng.pc @PKGCONFIGDIR@
-- @INSTALL_DATA@ libpng12.pc @PKGCONFIGDIR@
-+ @INSTALL@ -d $(DESTDIR)@PKGCONFIGDIR@
-+ @INSTALL_DATA@ libpng.pc $(DESTDIR)@PKGCONFIGDIR@
-+ @INSTALL_DATA@ libpng12.pc $(DESTDIR)@PKGCONFIGDIR@
-
- uninstall-local:
-- rm -f @PKGCONFIGDIR@/libpng.pc
-- rm -f @PKGCONFIGDIR@/libpng12.pc
-+ rm -f $(DESTDIR)@PKGCONFIGDIR@/libpng.pc
-+ rm -f $(DESTDIR)@PKGCONFIGDIR@/libpng12.pc
-
- libpng-config:
- ( cat ${srcdir}/scripts/libpng-config-head.in; \
diff --git a/patches/libpng-1.2.8-config/generic/Makefile_am_libpng_config.diff b/patches/libpng-1.2.8-config/generic/Makefile_am_libpng_config.diff
deleted file mode 100644
index 7161eb5b9..000000000
--- a/patches/libpng-1.2.8-config/generic/Makefile_am_libpng_config.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Submitted-By: Marc Kleine-Budde, 2006-02-09
-# Committed-By: Marc Kleine-Budde
-#
-# Error:
-#
-# libpng-config is not SYSROOT capable,
-#
-# Description:
-#
-# libpng-config spits out path like /usr/lib, this patch teaches to
-# honour SYSROOT
-#
-# State:
-#
-# not submittet upstream, (shame on me)
-#
-Index: libpng-1.2.8-config/Makefile.am
-===================================================================
---- libpng-1.2.8-config.orig/Makefile.am
-+++ libpng-1.2.8-config/Makefile.am
-@@ -55,9 +55,9 @@ uninstall-local:
-
- libpng-config:
- ( cat ${srcdir}/scripts/libpng-config-head.in; \
-- echo prefix=\"$(prefix)\"; \
-- echo I_opts=\"-I$(includedir)\"; \
-- echo L_opts=\"-L$(libdir)\"; \
-+ echo prefix=\"\$$SYSROOT$(prefix)\"; \
-+ echo I_opts=\"-I\$$SYSROOT$(includedir)\"; \
-+ echo L_opts=\"-L\$$SYSROOT$(libdir)\"; \
- echo R_opts=\"-Wl,-rpath,$(libdir)\"; \
- echo libs=\"-lpng12 -lz -lm\"; \
- cat ${srcdir}/scripts/libpng-config-body.in ) > libpng-config
diff --git a/patches/libpng-1.2.8-config/generic/Makefile_in_destdir.diff b/patches/libpng-1.2.8-config/generic/Makefile_in_destdir.diff
deleted file mode 100644
index 412585036..000000000
--- a/patches/libpng-1.2.8-config/generic/Makefile_in_destdir.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Submitted-By: Marc Kleine-Budde, 2006-02-09
-# Committed-By: Marc Kleine-Budde
-#
-# Error:
-#
-# libtool: install: warning: remember to run `libtool --finish /usr/lib'
-# cat ./scripts/libpng.pc.in | \
-# sed -e 's,[@]PREFIX[@],/usr,' -e 's,[@]INCLUDEDIR[@],/usr/include,' > libpng.pc
-# cp libpng.pc libpng12.pc
-# /usr/bin/install -c -d /usr/lib/pkgconfig
-# /usr/bin/install -c -m 644 libpng.pc /usr/lib/pkgconfig
-# /usr/bin/install: cannot remove `/usr/lib/pkgconfig/libpng.pc': Permission denied
-# make[2]: *** [install-data-local] Error 1
-# make[2]: Leaving directory `/home/mkl/pengutronix/pii/ptxdist-build/build-target/libpng-1.2.8-config'
-# make[1]: *** [install-am] Error 2
-# make[1]: Leaving directory `/home/mkl/pengutronix/pii/ptxdist-build/build-target/libpng-1.2.8-config'
-# make: *** [/home/mkl/pengutronix/pii/ptxdist-build/state/libpng.install] Error 2
-#
-# Description:
-#
-# the installation of libpng.pc fails, because DESTDIR is not
-# honoured
-#
-# State:
-#
-# BUG: 1285794 on libpng's bugtracket on sf.net
-#
-# bug remains open :(
-#
-# http://sourceforge.net/tracker/?group_id=5624&atid=105624&func=detail&aid=1285794
-#
-Index: libpng-1.2.8-config/Makefile.in
-===================================================================
---- libpng-1.2.8-config.orig/Makefile.in
-+++ libpng-1.2.8-config/Makefile.in
-@@ -874,13 +874,13 @@ libpng12.pc: libpng.pc
- cp libpng.pc libpng12.pc
-
- install-data-local: libpng.pc libpng12.pc
-- @INSTALL@ -d @PKGCONFIGDIR@
-- @INSTALL_DATA@ libpng.pc @PKGCONFIGDIR@
-- @INSTALL_DATA@ libpng12.pc @PKGCONFIGDIR@
-+ @INSTALL@ -d $(DESTDIR)@PKGCONFIGDIR@
-+ @INSTALL_DATA@ libpng.pc $(DESTDIR)@PKGCONFIGDIR@
-+ @INSTALL_DATA@ libpng12.pc $(DESTDIR)@PKGCONFIGDIR@
-
- uninstall-local:
-- rm -f @PKGCONFIGDIR@/libpng.pc
-- rm -f @PKGCONFIGDIR@/libpng12.pc
-+ rm -f $(DESTDIR)@PKGCONFIGDIR@/libpng.pc
-+ rm -f $(DESTDIR)@PKGCONFIGDIR@/libpng12.pc
-
- libpng-config:
- ( cat ${srcdir}/scripts/libpng-config-head.in; \
diff --git a/patches/libpng-1.2.8-config/generic/Makefile_in_libpng_config.diff b/patches/libpng-1.2.8-config/generic/Makefile_in_libpng_config.diff
deleted file mode 100644
index fdb226efb..000000000
--- a/patches/libpng-1.2.8-config/generic/Makefile_in_libpng_config.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Submitted-By: Marc Kleine-Budde, 2006-02-09
-# Committed-By: Marc Kleine-Budde
-#
-# Error:
-#
-# libpng-config is not SYSROOT capable,
-#
-# Description:
-#
-# libpng-config spits out path like /usr/lib, this patch teaches to
-# honour SYSROOT
-#
-# State:
-#
-# not submittet upstream, (shame on me)
-#
-Index: libpng-1.2.8-config/Makefile.in
-===================================================================
---- libpng-1.2.8-config.orig/Makefile.in
-+++ libpng-1.2.8-config/Makefile.in
-@@ -884,9 +884,9 @@ uninstall-local:
-
- libpng-config:
- ( cat ${srcdir}/scripts/libpng-config-head.in; \
-- echo prefix=\"$(prefix)\"; \
-- echo I_opts=\"-I$(includedir)\"; \
-- echo L_opts=\"-L$(libdir)\"; \
-+ echo prefix=\"\$$SYSROOT$(prefix)\"; \
-+ echo I_opts=\"-I\$$SYSROOT$(includedir)\"; \
-+ echo L_opts=\"-L\$$SYSROOT$(libdir)\"; \
- echo R_opts=\"-Wl,-rpath,$(libdir)\"; \
- echo libs=\"-lpng12 -lz -lm\"; \
- cat ${srcdir}/scripts/libpng-config-body.in ) > libpng-config
diff --git a/patches/libpng-1.2.8-config/generic/series b/patches/libpng-1.2.8-config/generic/series
deleted file mode 100644
index 1a3dc9e73..000000000
--- a/patches/libpng-1.2.8-config/generic/series
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile_am_destdir.diff
-Makefile_in_destdir.diff
-Makefile_am_libpng_config.diff
-Makefile_in_libpng_config.diff