* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2007-01-10 10:29 andersen at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: andersen at uclibc.org @ 2007-01-10 10:29 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-10 02:29:24 -0800 (Wed, 10 Jan 2007)
New Revision: 17222
Log:
fix install such that pkg-config setup is correct
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2007-01-10 09:28:01 UTC (rev 17221)
+++ trunk/buildroot/package/libpng/libpng.mk 2007-01-10 10:29:24 UTC (rev 17222)
@@ -50,7 +50,10 @@
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=/usr \
+ --prefix=$(STAGING_DIR) \
+ --exec_prefix=$(STAGING_DIR) \
+ --libdir=$(STAGING_DIR)/lib \
+ --includedir=$(STAGING_DIR)/include \
--without-libpng-compat \
);
touch $(LIBPNG_DIR)/.configured
@@ -60,11 +63,21 @@
touch $(LIBPNG_DIR)/.compiled
$(STAGING_DIR)/lib/libpng.so: $(LIBPNG_DIR)/.compiled
- $(MAKE) \
- -C $(LIBPNG_DIR) \
- DESTDIR=$(STAGING_DIR) \
- prefix=/ \
- install
+ $(MAKE) prefix=$(STAGING_DIR) \
+ exec_prefix=$(STAGING_DIR) \
+ bindir=$(STAGING_DIR)/bin \
+ sbindir=$(STAGING_DIR)/sbin \
+ libexecdir=$(STAGING_DIR)/libexec \
+ datadir=$(STAGING_DIR)/share \
+ sysconfdir=$(STAGING_DIR)/etc \
+ sharedstatedir=$(STAGING_DIR)/com \
+ localstatedir=$(STAGING_DIR)/var \
+ libdir=$(STAGING_DIR)/lib \
+ includedir=$(STAGING_DIR)/include \
+ oldincludedir=$(STAGING_DIR)/include \
+ infodir=$(STAGING_DIR)/info \
+ mandir=$(STAGING_DIR)/man \
+ -C $(LIBPNG_DIR) install;
touch -c $(STAGING_DIR)/lib/libpng.so
$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/lib/libpng.so
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2007-01-11 7:26 andersen at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: andersen at uclibc.org @ 2007-01-11 7:26 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-10 23:26:02 -0800 (Wed, 10 Jan 2007)
New Revision: 17242
Log:
be explicit about not depending on X, dep should go the other way
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2007-01-11 07:25:29 UTC (rev 17241)
+++ trunk/buildroot/package/libpng/libpng.mk 2007-01-11 07:26:02 UTC (rev 17242)
@@ -55,6 +55,7 @@
--libdir=$(STAGING_DIR)/lib \
--includedir=$(STAGING_DIR)/include \
--without-libpng-compat \
+ --without-x \
);
touch $(LIBPNG_DIR)/.configured
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2007-02-03 18:47 andersen at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: andersen at uclibc.org @ 2007-02-03 18:47 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-02-03 10:47:50 -0800 (Sat, 03 Feb 2007)
New Revision: 17742
Log:
new stable upstream version
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2007-02-03 17:29:14 UTC (rev 17741)
+++ trunk/buildroot/package/libpng/libpng.mk 2007-02-03 18:47:50 UTC (rev 17742)
@@ -21,7 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-LIBPNG_VER:=1.2.12
+LIBPNG_VER:=1.2.16
LIBPNG_DIR:=$(BUILD_DIR)/libpng-$(LIBPNG_VER)
LIBPNG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
LIBPNG_SOURCE:=libpng-$(LIBPNG_VER).tar.bz2
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2007-07-29 7:14 ulf at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: ulf at uclibc.org @ 2007-07-29 7:14 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-29 00:14:01 -0700 (Sun, 29 Jul 2007)
New Revision: 19316
Log:
Cleanup of libpng
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2007-07-29 07:11:20 UTC (rev 19315)
+++ trunk/buildroot/package/libpng/libpng.mk 2007-07-29 07:14:01 UTC (rev 19316)
@@ -35,7 +35,7 @@
$(LIBPNG_DIR)/.unpacked: $(DL_DIR)/$(LIBPNG_SOURCE)
$(LIBPNG_CAT) $(DL_DIR)/$(LIBPNG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(CONFIG_UPDATE) $(LIBPNG_DIR)
- touch $(LIBPNG_DIR)/.unpacked
+ touch $@
$(LIBPNG_DIR)/.configured: $(LIBPNG_DIR)/.unpacked
(cd $(LIBPNG_DIR); rm -rf config.cache; \
@@ -51,35 +51,26 @@
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
--sysconfdir=/etc \
- --datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
--without-libpng-compat \
--without-x \
);
- touch $(LIBPNG_DIR)/.configured
+ touch $@
$(LIBPNG_DIR)/.compiled: $(LIBPNG_DIR)/.configured
$(MAKE) -C $(LIBPNG_DIR)
- touch $(LIBPNG_DIR)/.compiled
+ touch $@
$(STAGING_DIR)/lib/libpng.so: $(LIBPNG_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPNG_DIR) install;
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libpng12.la
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libpng12.la
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
- -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/include/libpng12\',g" \
- -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
+ -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng12\',g" \
+ -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/bin/libpng12-config
- touch -c $(STAGING_DIR)/lib/libpng.so
+ touch -c $@
$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/lib/libpng.so
cp -dpf $(STAGING_DIR)/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2007-08-01 8:36 ulf at uclibc.org
2007-08-01 9:47 ` Hebbar
0 siblings, 1 reply; 24+ messages in thread
From: ulf at uclibc.org @ 2007-08-01 8:36 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-01 01:36:11 -0700 (Wed, 01 Aug 2007)
New Revision: 19378
Log:
Cleanup libpng, use usr/lib
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2007-08-01 08:35:13 UTC (rev 19377)
+++ trunk/buildroot/package/libpng/libpng.mk 2007-08-01 08:36:11 UTC (rev 19378)
@@ -62,7 +62,7 @@
$(MAKE) -C $(LIBPNG_DIR)
touch $@
-$(STAGING_DIR)/lib/libpng.so: $(LIBPNG_DIR)/.compiled
+$(STAGING_DIR)/usr/lib/libpng.so: $(LIBPNG_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPNG_DIR) install;
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libpng12.la
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
@@ -72,9 +72,9 @@
$(STAGING_DIR)/usr/bin/libpng12-config
touch -c $@
-$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/lib/libpng.so
+$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/usr/lib/libpng.so
cp -dpf $(STAGING_DIR)/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libpng.so
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libpng*
png libpng: uclibc zlib pkgconfig $(TARGET_DIR)/usr/lib/libpng.so
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2007-08-01 8:36 ulf at uclibc.org
@ 2007-08-01 9:47 ` Hebbar
0 siblings, 0 replies; 24+ messages in thread
From: Hebbar @ 2007-08-01 9:47 UTC (permalink / raw)
To: buildroot
I think even this needs to be added
-$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/lib/libpng.so
+$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/usr/lib/libpng.so
- cp -dpf $(STAGING_DIR)/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
+ cp -dpf $(STAGING_DIR)/usr/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
Regards
Gururaja
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-libpng-tf4198722.html#a11942636
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2007-08-05 14:00 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-08-05 14:00 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-08-05 07:00:05 -0700 (Sun, 05 Aug 2007)
New Revision: 19406
Log:
- fix bug introduced by ulf in r19378.
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2007-08-05 12:21:11 UTC (rev 19405)
+++ trunk/buildroot/package/libpng/libpng.mk 2007-08-05 14:00:05 UTC (rev 19406)
@@ -73,7 +73,7 @@
touch -c $@
$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/usr/lib/libpng.so
- cp -dpf $(STAGING_DIR)/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
+ cp -dpf $(STAGING_DIR)/usr/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libpng*
png libpng: uclibc zlib pkgconfig $(TARGET_DIR)/usr/lib/libpng.so
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2008-02-28 13:46 sjhill at uclibc.org
2008-02-28 21:43 ` Ulf Samuelsson
0 siblings, 1 reply; 24+ messages in thread
From: sjhill at uclibc.org @ 2008-02-28 13:46 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2008-02-28 05:46:22 -0800 (Thu, 28 Feb 2008)
New Revision: 21137
Log:
Clean up patches and applying of them.
Added:
trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch
Removed:
trunk/buildroot/package/libpng/libdir-la.patch
trunk/buildroot/package/libpng/remove-setjmp-error.patch
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Deleted: trunk/buildroot/package/libpng/libdir-la.patch
===================================================================
--- trunk/buildroot/package/libpng/libdir-la.patch 2008-02-28 13:14:42 UTC (rev 21136)
+++ trunk/buildroot/package/libpng/libdir-la.patch 2008-02-28 13:46:22 UTC (rev 21137)
@@ -1,77 +0,0 @@
---- libpng-1.2.12/ltmain.sh.orig 2006-06-05 09:12:42.000000000 -0600
-+++ libpng-1.2.12/ltmain.sh 2007-01-13 14:39:14.000000000 -0700
-@@ -322,8 +322,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2453,8 +2454,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -2935,6 +2942,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5659,6 +5676,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -6028,10 +6049,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
Added: trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch
===================================================================
--- trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch (rev 0)
+++ trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch 2008-02-28 13:46:22 UTC (rev 21137)
@@ -0,0 +1,17 @@
+diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
+--- libpng-1.2.16/pngconf.h 2007-01-31 07:22:33.000000000 -0600
++++ libpng-1.2.16-patched/pngconf.h 2008-02-27 17:40:23.707516659 -0600
+@@ -310,13 +310,6 @@
+ # define PNG_SAVE_BSD_SOURCE
+ # undef _BSD_SOURCE
+ # endif
+-# ifdef _SETJMP_H
+- /* If you encounter a compiler error here, see the explanation
+- * near the end of INSTALL.
+- */
+- __png.h__ already includes setjmp.h;
+- __dont__ include it again.;
+-# endif
+ # endif /* __linux__ */
+
+ /* include setjmp.h for error handling */
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2008-02-28 13:14:42 UTC (rev 21136)
+++ trunk/buildroot/package/libpng/libpng.mk 2008-02-28 13:46:22 UTC (rev 21137)
@@ -34,6 +34,7 @@
$(LIBPNG_DIR)/.unpacked: $(DL_DIR)/$(LIBPNG_SOURCE)
$(LIBPNG_CAT) $(DL_DIR)/$(LIBPNG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(LIBPNG_DIR) package/libpng/ libpng\*.patch
$(CONFIG_UPDATE) $(LIBPNG_DIR)
touch $@
Deleted: trunk/buildroot/package/libpng/remove-setjmp-error.patch
===================================================================
--- trunk/buildroot/package/libpng/remove-setjmp-error.patch 2008-02-28 13:14:42 UTC (rev 21136)
+++ trunk/buildroot/package/libpng/remove-setjmp-error.patch 2008-02-28 13:46:22 UTC (rev 21137)
@@ -1,17 +0,0 @@
-diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
---- libpng-1.2.16/pngconf.h 2007-01-31 07:22:33.000000000 -0600
-+++ libpng-1.2.16-patched/pngconf.h 2008-02-27 17:40:23.707516659 -0600
-@@ -310,13 +310,6 @@
- # define PNG_SAVE_BSD_SOURCE
- # undef _BSD_SOURCE
- # endif
--# ifdef _SETJMP_H
-- /* If you encounter a compiler error here, see the explanation
-- * near the end of INSTALL.
-- */
-- __png.h__ already includes setjmp.h;
-- __dont__ include it again.;
--# endif
- # endif /* __linux__ */
-
- /* include setjmp.h for error handling */
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2008-02-28 13:46 sjhill at uclibc.org
@ 2008-02-28 21:43 ` Ulf Samuelsson
0 siblings, 0 replies; 24+ messages in thread
From: Ulf Samuelsson @ 2008-02-28 21:43 UTC (permalink / raw)
To: buildroot
> Author: sjhill
> Date: 2008-02-28 05:46:22 -0800 (Thu, 28 Feb 2008)
> New Revision: 21137
>
> Log:
> Clean up patches and applying of them.
>
>
> Added:
> trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch
>
> Removed:
> trunk/buildroot/package/libpng/libdir-la.patch
> trunk/buildroot/package/libpng/remove-setjmp-error.patch
>
> Modified:
> trunk/buildroot/package/libpng/libpng.mk
>
Why was the "libdir-la.patch" patch removed?
Best Regards
Ulf Samuelsson
>
> Changeset:
> Deleted: trunk/buildroot/package/libpng/libdir-la.patch
> ===================================================================
> --- trunk/buildroot/package/libpng/libdir-la.patch 2008-02-28 13:14:42 UTC (rev 21136)
> +++ trunk/buildroot/package/libpng/libdir-la.patch 2008-02-28 13:46:22 UTC (rev 21137)
> @@ -1,77 +0,0 @@
> ---- libpng-1.2.12/ltmain.sh.orig 2006-06-05 09:12:42.000000000 -0600
> -+++ libpng-1.2.12/ltmain.sh 2007-01-13 14:39:14.000000000 -0700
> -@@ -322,8 +322,9 @@
> - # line option must be used.
> - if test -z "$tagname"; then
> - $echo "$modename: unable to infer tagged configuration"
> -- $echo "$modename: specify a tag with \`--tag'" 1>&2
> -- exit $EXIT_FAILURE
> -+ $echo "$modename: defaulting to \`CC'"
> -+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
> -+# exit $EXIT_FAILURE
> - # else
> - # $echo "$modename: using $tagname tagged configuration"
> - fi
> -@@ -2453,8 +2454,14 @@
> - absdir="$abs_ladir"
> - libdir="$abs_ladir"
> - else
> -- dir="$libdir"
> -- absdir="$libdir"
> -+ # Adding 'libdir' from the .la file to our library search paths
> -+ # breaks crosscompilation horribly. We cheat here and don't add
> -+ # it, instead adding the path where we found the .la. -CL
> -+ dir="$abs_ladir"
> -+ absdir="$abs_ladir"
> -+ libdir="$abs_ladir"
> -+ #dir="$libdir"
> -+ #absdir="$libdir"
> - fi
> - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
> - else
> -@@ -2935,6 +2942,16 @@
> - esac
> - if grep "^installed=no" $deplib > /dev/null; then
> - path="$absdir/$objdir"
> -+# This interferes with crosscompilation. -CL
> -+# else
> -+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
> -+# if test -z "$libdir"; then
> -+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
> -+# exit 1
> -+# fi
> -+# if test "$absdir" != "$libdir"; then
> -+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
> -+# fi
> - else
> - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
> - if test -z "$libdir"; then
> -@@ -5659,6 +5676,10 @@
> - # Replace all uninstalled libtool libraries with the installed ones
> - newdependency_libs=
> - for deplib in $dependency_libs; do
> -+ # Replacing uninstalled with installed can easily break crosscompilation,
> -+ # since the installed path is generally the wrong architecture. -CL
> -+ newdependency_libs="$newdependency_libs $deplib"
> -+ continue
> - case $deplib in
> - *.la)
> - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
> -@@ -6028,10 +6049,13 @@
> - # At present, this check doesn't affect windows .dll's that
> - # are installed into $libdir/../bin (currently, that works fine)
> - # but it's something to keep an eye on.
> -- if test "$inst_prefix_dir" = "$destdir"; then
> -- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
> -- exit $EXIT_FAILURE
> -- fi
> -+ #
> -+ # This breaks install into our staging area. -PB
> -+ #
> -+ # if test "$inst_prefix_dir" = "$destdir"; then
> -+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
> -+ # exit $EXIT_FAILURE
> -+ # fi
> -
> - if test -n "$inst_prefix_dir"; then
> - # Stick the inst_prefix_dir data into the link command.
>
> Added: trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch
> ===================================================================
> --- trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch (rev 0)
> +++ trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch 2008-02-28 13:46:22 UTC (rev 21137)
> @@ -0,0 +1,17 @@
> +diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
> +--- libpng-1.2.16/pngconf.h 2007-01-31 07:22:33.000000000 -0600
> ++++ libpng-1.2.16-patched/pngconf.h 2008-02-27 17:40:23.707516659 -0600
> +@@ -310,13 +310,6 @@
> + # define PNG_SAVE_BSD_SOURCE
> + # undef _BSD_SOURCE
> + # endif
> +-# ifdef _SETJMP_H
> +- /* If you encounter a compiler error here, see the explanation
> +- * near the end of INSTALL.
> +- */
> +- __png.h__ already includes setjmp.h;
> +- __dont__ include it again.;
> +-# endif
> + # endif /* __linux__ */
> +
> + /* include setjmp.h for error handling */
>
> Modified: trunk/buildroot/package/libpng/libpng.mk
> ===================================================================
> --- trunk/buildroot/package/libpng/libpng.mk 2008-02-28 13:14:42 UTC (rev 21136)
> +++ trunk/buildroot/package/libpng/libpng.mk 2008-02-28 13:46:22 UTC (rev 21137)
> @@ -34,6 +34,7 @@
>
> $(LIBPNG_DIR)/.unpacked: $(DL_DIR)/$(LIBPNG_SOURCE)
> $(LIBPNG_CAT) $(DL_DIR)/$(LIBPNG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> + toolchain/patch-kernel.sh $(LIBPNG_DIR) package/libpng/ libpng\*.patch
> $(CONFIG_UPDATE) $(LIBPNG_DIR)
> touch $@
>
>
> Deleted: trunk/buildroot/package/libpng/remove-setjmp-error.patch
> ===================================================================
> --- trunk/buildroot/package/libpng/remove-setjmp-error.patch 2008-02-28 13:14:42 UTC (rev 21136)
> +++ trunk/buildroot/package/libpng/remove-setjmp-error.patch 2008-02-28 13:46:22 UTC (rev 21137)
> @@ -1,17 +0,0 @@
> -diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
> ---- libpng-1.2.16/pngconf.h 2007-01-31 07:22:33.000000000 -0600
> -+++ libpng-1.2.16-patched/pngconf.h 2008-02-27 17:40:23.707516659 -0600
> -@@ -310,13 +310,6 @@
> - # define PNG_SAVE_BSD_SOURCE
> - # undef _BSD_SOURCE
> - # endif
> --# ifdef _SETJMP_H
> -- /* If you encounter a compiler error here, see the explanation
> -- * near the end of INSTALL.
> -- */
> -- __png.h__ already includes setjmp.h;
> -- __dont__ include it again.;
> --# endif
> - # endif /* __linux__ */
> -
> - /* include setjmp.h for error handling */
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2008-03-04 11:36 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-03-04 11:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-04 03:36:23 -0800 (Tue, 04 Mar 2008)
New Revision: 21159
Log:
libpng: bump version
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2008-03-04 11:36:20 UTC (rev 21158)
+++ trunk/buildroot/package/libpng/libpng.mk 2008-03-04 11:36:23 UTC (rev 21159)
@@ -21,7 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-LIBPNG_VERSION:=1.2.16
+LIBPNG_VERSION:=1.2.25
LIBPNG_DIR:=$(BUILD_DIR)/libpng-$(LIBPNG_VERSION)
LIBPNG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
LIBPNG_SOURCE:=libpng-$(LIBPNG_VERSION).tar.bz2
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2008-03-04 11:36 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-03-04 11:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-04 03:36:25 -0800 (Tue, 04 Mar 2008)
New Revision: 21160
Log:
libpng: select zlib package
Modified:
trunk/buildroot/package/libpng/Config.in
Changeset:
Modified: trunk/buildroot/package/libpng/Config.in
===================================================================
--- trunk/buildroot/package/libpng/Config.in 2008-03-04 11:36:23 UTC (rev 21159)
+++ trunk/buildroot/package/libpng/Config.in 2008-03-04 11:36:25 UTC (rev 21160)
@@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBPNG
bool "libpng"
default n
+ select BR2_PACKAGE_ZLIB
help
Library for handling PNG (Portable Network Graphics)
images.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2008-03-05 13:35 sjhill at uclibc.org
2008-03-05 14:02 ` Peter Korsgaard
0 siblings, 1 reply; 24+ messages in thread
From: sjhill at uclibc.org @ 2008-03-05 13:35 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2008-03-05 05:35:23 -0800 (Wed, 05 Mar 2008)
New Revision: 21165
Log:
Fix patch. Apparently people don't know how to test their changes before
cheking them in.
Modified:
trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch
Changeset:
Modified: trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch
===================================================================
--- trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch 2008-03-05 10:35:56 UTC (rev 21164)
+++ trunk/buildroot/package/libpng/libpng-remove-setjmp-error.patch 2008-03-05 13:35:23 UTC (rev 21165)
@@ -1,7 +1,7 @@
-diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
---- libpng-1.2.16/pngconf.h 2007-01-31 07:22:33.000000000 -0600
-+++ libpng-1.2.16-patched/pngconf.h 2008-02-27 17:40:23.707516659 -0600
-@@ -310,13 +310,6 @@
+diff -ur libpng-1.2.25/pngconf.h libpng-1.2.25-patched/pngconf.h
+--- libpng-1.2.25/pngconf.h 2008-02-18 16:31:05.000000000 -0600
++++ libpng-1.2.25-patched/pngconf.h 2008-03-05 07:30:22.900478085 -0600
+@@ -319,13 +319,6 @@
# define PNG_SAVE_BSD_SOURCE
# undef _BSD_SOURCE
# endif
@@ -9,7 +9,7 @@
- /* If you encounter a compiler error here, see the explanation
- * near the end of INSTALL.
- */
-- __png.h__ already includes setjmp.h;
+- __pngconf.h__ already includes setjmp.h;
- __dont__ include it again.;
-# endif
# endif /* __linux__ */
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2008-03-05 13:35 sjhill at uclibc.org
@ 2008-03-05 14:02 ` Peter Korsgaard
2008-03-05 14:06 ` sjhill at realitydiluted.com
0 siblings, 1 reply; 24+ messages in thread
From: Peter Korsgaard @ 2008-03-05 14:02 UTC (permalink / raw)
To: buildroot
>>>>> "sjhill" == sjhill <sjhill@uclibc.org> writes:
sjhill> Author: sjhill
sjhill> Date: 2008-03-05 05:35:23 -0800 (Wed, 05 Mar 2008)
sjhill> New Revision: 21165
sjhill> Log:
sjhill> Fix patch. Apparently people don't know how to test
sjhill> their changes before cheking them in.
Strange. It seems like my tree was missing your patch from the 28th -
sorry about that.
Everything seems to work fine without it though, what is the patch
supposed to fix?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2008-03-05 14:02 ` Peter Korsgaard
@ 2008-03-05 14:06 ` sjhill at realitydiluted.com
2008-03-05 14:52 ` Peter Korsgaard
0 siblings, 1 reply; 24+ messages in thread
From: sjhill at realitydiluted.com @ 2008-03-05 14:06 UTC (permalink / raw)
To: buildroot
> sjhill> Fix patch. Apparently people don't know how to test
> sjhill> their changes before cheking them in.
>
> Strange. It seems like my tree was missing your patch from the 28th -
> sorry about that.
>
> Everything seems to work fine without it though, what is the patch
> supposed to fix?
>
At least when compiling for ARM, the build fails because of 'setjmp.h'
being included multiple times. I thing the check is stupid, so I removed
it.
-Steve
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2008-03-05 14:06 ` sjhill at realitydiluted.com
@ 2008-03-05 14:52 ` Peter Korsgaard
0 siblings, 0 replies; 24+ messages in thread
From: Peter Korsgaard @ 2008-03-05 14:52 UTC (permalink / raw)
To: buildroot
>>>>> "sjhill" == sjhill <sjhill@realitydiluted.com> writes:
Hi,
sjhill> At least when compiling for ARM, the build fails because of 'setjmp.h'
sjhill> being included multiple times. I thing the check is stupid,
sjhill> so I removed
Ok, haven't seen that problem on x86 or ppc.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2008-10-06 15:11 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-10-06 15:11 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-06 08:11:15 -0700 (Mon, 06 Oct 2008)
New Revision: 23601
Log:
png: bump version
Upgrade libpng to 1.2.32
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2008-10-06 15:04:46 UTC (rev 23600)
+++ trunk/buildroot/package/libpng/libpng.mk 2008-10-06 15:11:15 UTC (rev 23601)
@@ -21,7 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-LIBPNG_VERSION:=1.2.25
+LIBPNG_VERSION:=1.2.32
LIBPNG_DIR:=$(BUILD_DIR)/libpng-$(LIBPNG_VERSION)
LIBPNG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
LIBPNG_SOURCE:=libpng-$(LIBPNG_VERSION).tar.bz2
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2008-10-29 12:49 laird at uclibc.org
2008-10-29 13:53 ` Peter Korsgaard
0 siblings, 1 reply; 24+ messages in thread
From: laird at uclibc.org @ 2008-10-29 12:49 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2008-10-29 05:49:38 -0700 (Wed, 29 Oct 2008)
New Revision: 23851
Log:
package/libpng/libpng.mk: Change to autotools.in format
Move libpng into the new era.....
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2008-10-29 12:25:39 UTC (rev 23850)
+++ trunk/buildroot/package/libpng/libpng.mk 2008-10-29 12:49:38 UTC (rev 23851)
@@ -3,93 +3,30 @@
# libpng (Portable Network Graphic library)
#
#############################################################
-# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-
LIBPNG_VERSION:=1.2.32
-LIBPNG_DIR:=$(BUILD_DIR)/libpng-$(LIBPNG_VERSION)
-LIBPNG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
-LIBPNG_SOURCE:=libpng-$(LIBPNG_VERSION).tar.bz2
-LIBPNG_CAT:=$(BZCAT)
-
-$(DL_DIR)/$(LIBPNG_SOURCE):
- $(WGET) -P $(DL_DIR) $(LIBPNG_SITE)/$(LIBPNG_SOURCE)
-
-libpng-source: $(DL_DIR)/$(LIBPNG_SOURCE)
-
-$(LIBPNG_DIR)/.unpacked: $(DL_DIR)/$(LIBPNG_SOURCE)
- $(LIBPNG_CAT) $(DL_DIR)/$(LIBPNG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIBPNG_DIR) package/libpng/ libpng\*.patch
- $(CONFIG_UPDATE) $(LIBPNG_DIR)
- touch $@
-
-$(LIBPNG_DIR)/.configured: $(LIBPNG_DIR)/.unpacked
- (cd $(LIBPNG_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
+LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
+LIBPNG_LIBTOOL_PATCH = NO
+LIBPNG_INSTALL_STAGING = YES
+LIBPNG_INSTALL_TARGET = YES
+LIBPNG_CONF_ENV = \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
- ac_cv_func_realloc_0_nonnull=yes \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
+ ac_cv_func_realloc_0_nonnull=yes
+LIBPNG_CONF_OPT = \
--without-libpng-compat \
- --without-x \
- )
- touch $@
+ --without-x
+LIBPNG_DEPENDENCIES = uclibc pkgconfig zlib
-$(LIBPNG_DIR)/.compiled: $(LIBPNG_DIR)/.configured
- $(MAKE) -C $(LIBPNG_DIR)
- touch $@
+$(eval $(call AUTOTARGETS,package,libpng))
-$(STAGING_DIR)/usr/lib/libpng.so: $(LIBPNG_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPNG_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libpng12.la
+$(LIBPNG_HOOK_POST_INSTALL):
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng12\',g" \
-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/bin/libpng12-config
- touch -c $@
+ touch $@
-$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/usr/lib/libpng.so
- cp -dpf $(STAGING_DIR)/usr/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libpng*
-
-png libpng: uclibc zlib pkgconfig $(TARGET_DIR)/usr/lib/libpng.so
-
-libpng-clean:
- -$(MAKE) -C $(LIBPNG_DIR) clean
-
-libpng-dirclean:
- rm -rf $(LIBPNG_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LIBPNG)),y)
-TARGETS+=libpng
-endif
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2008-10-29 12:49 laird at uclibc.org
@ 2008-10-29 13:53 ` Peter Korsgaard
2008-10-29 14:15 ` Daniel J Laird
2008-10-29 15:33 ` Daniel J Laird
0 siblings, 2 replies; 24+ messages in thread
From: Peter Korsgaard @ 2008-10-29 13:53 UTC (permalink / raw)
To: buildroot
>>>>> "laird" == laird <laird@uclibc.org> writes:
laird> Author: laird
laird> Date: 2008-10-29 05:49:38 -0700 (Wed, 29 Oct 2008)
laird> New Revision: 23851
laird> Log:
laird> package/libpng/libpng.mk: Change to autotools.in format
laird> Move libpng into the new era.....
Cool.
laird> +LIBPNG_CONF_ENV = \
laird> ac_cv_have_decl_malloc=yes \
laird> gl_cv_func_malloc_0_nonnull=yes \
laird> ac_cv_func_malloc_0_nonnull=yes \
laird> ac_cv_func_calloc_0_nonnull=yes \
laird> - ac_cv_func_realloc_0_nonnull=yes \
We have a BR2_AC_CV_FUNC_MALLOC_0_NONNULL for this (it seems to be
missing calloc though).
laird> +LIBPNG_CONF_OPT = \
laird> --without-libpng-compat \
laird> - --without-x \
laird> - )
laird> - touch $@
laird> + --without-x
Does libpng configure really have a --without-x option? I'm pretty
sure it doesn't.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2008-10-29 13:53 ` Peter Korsgaard
@ 2008-10-29 14:15 ` Daniel J Laird
2008-10-29 15:33 ` Daniel J Laird
1 sibling, 0 replies; 24+ messages in thread
From: Daniel J Laird @ 2008-10-29 14:15 UTC (permalink / raw)
To: buildroot
I just did the port to Autotools.in first and now I will do a tidy up.......
Cheers
Dan
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2008-10-29 13:53 ` Peter Korsgaard
2008-10-29 14:15 ` Daniel J Laird
@ 2008-10-29 15:33 ` Daniel J Laird
2008-10-29 15:58 ` Peter Korsgaard
1 sibling, 1 reply; 24+ messages in thread
From: Daniel J Laird @ 2008-10-29 15:33 UTC (permalink / raw)
To: buildroot
The BR2_AC_CV_FUNC_MALLOC_0_NONNULL value seems to depend up a value called MALLOC_GLIBC_COMPAT. This is only set in the uClibC config files. This means GLIBC based external toolchains cant use this BR2_AC_CV_FUNC_MALLOC_0_NONNULL if they want it set to yes like libpng does.
1. We could add the calloc stuff
2. We could have
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes
When using an external toolchain as well
Any thoughts?
Cheers
Dan
-----Original Message-----
From: buildroot-bounces@uclibc.org [mailto:buildroot-bounces at uclibc.org] On Behalf Of Peter Korsgaard
Sent: 2008 Oct 29 13:53
To: buildroot at uclibc.org
Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/libpng
>>>>> "laird" == laird <laird@uclibc.org> writes:
laird> Author: laird
laird> Date: 2008-10-29 05:49:38 -0700 (Wed, 29 Oct 2008)
laird> New Revision: 23851
laird> Log:
laird> package/libpng/libpng.mk: Change to autotools.in format
laird> Move libpng into the new era.....
Cool.
laird> +LIBPNG_CONF_ENV = \
laird> ac_cv_have_decl_malloc=yes \
laird> gl_cv_func_malloc_0_nonnull=yes \
laird> ac_cv_func_malloc_0_nonnull=yes \
laird> ac_cv_func_calloc_0_nonnull=yes \
laird> - ac_cv_func_realloc_0_nonnull=yes \
We have a BR2_AC_CV_FUNC_MALLOC_0_NONNULL for this (it seems to be
missing calloc though).
laird> +LIBPNG_CONF_OPT = \
laird> --without-libpng-compat \
laird> - --without-x \
laird> - )
laird> - touch $@
laird> + --without-x
Does libpng configure really have a --without-x option? I'm pretty
sure it doesn't.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot at uclibc.org
http://busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
2008-10-29 15:33 ` Daniel J Laird
@ 2008-10-29 15:58 ` Peter Korsgaard
0 siblings, 0 replies; 24+ messages in thread
From: Peter Korsgaard @ 2008-10-29 15:58 UTC (permalink / raw)
To: buildroot
>>>>> "Daniel" == Daniel J Laird <daniel.j.laird@nxp.com> writes:
Daniel> The BR2_AC_CV_FUNC_MALLOC_0_NONNULL value seems to depend up a value called MALLOC_GLIBC_COMPAT. This is only set in the uClibC config files. This means GLIBC based external toolchains cant use this BR2_AC_CV_FUNC_MALLOC_0_NONNULL if they want it set to yes like libpng does.
Daniel> 1. We could add the calloc stuff
Daniel> 2. We could have
Daniel> ac_cv_have_decl_malloc=yes \
Daniel> gl_cv_func_malloc_0_nonnull=yes \
Daniel> ac_cv_func_malloc_0_nonnull=yes \
Daniel> ac_cv_func_calloc_0_nonnull=yes \
Daniel> ac_cv_func_realloc_0_nonnull=yes
Daniel> When using an external toolchain as well
Or provide an option to let the user set it to whatever their
toolchain does. I'm not familiar with the external toolchain stuff,
how's the other toolchain settins handled (largefile, locales, wchar,
..)?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2009-01-12 12:45 laird at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: laird at uclibc.org @ 2009-01-12 12:45 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2009-01-12 12:45:48 +0000 (Mon, 12 Jan 2009)
New Revision: 24793
Log:
package/libpng/libpng.mk: Remove the unnecessary --without-x option
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2009-01-12 12:40:48 UTC (rev 24792)
+++ trunk/buildroot/package/libpng/libpng.mk 2009-01-12 12:45:48 UTC (rev 24793)
@@ -15,9 +15,7 @@
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes
-LIBPNG_CONF_OPT = \
- --without-libpng-compat \
- --without-x
+LIBPNG_CONF_OPT = --without-libpng-compat
LIBPNG_DEPENDENCIES = uclibc pkgconfig zlib
$(eval $(call AUTOTARGETS,package,libpng))
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2009-02-12 12:17 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2009-02-12 12:17 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-12 12:17:12 +0000 (Thu, 12 Feb 2009)
New Revision: 25306
Log:
libpng: bump version
Fixes memory leak and double-free vulnerability
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2009-02-12 09:33:01 UTC (rev 25305)
+++ trunk/buildroot/package/libpng/libpng.mk 2009-02-12 12:17:12 UTC (rev 25306)
@@ -3,7 +3,7 @@
# libpng (Portable Network Graphic library)
#
#############################################################
-LIBPNG_VERSION:=1.2.32
+LIBPNG_VERSION:=1.2.34
LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
LIBPNG_LIBTOOL_PATCH = NO
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libpng
@ 2009-02-27 14:59 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2009-02-27 14:59 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-27 14:59:17 +0000 (Fri, 27 Feb 2009)
New Revision: 25468
Log:
libpng: bump version
Fixes unitialized data bug (CVE-2009-0040).
Patch by Soef Qued <souf_oued@yahoo.fr>
Modified:
trunk/buildroot/package/libpng/libpng.mk
Changeset:
Modified: trunk/buildroot/package/libpng/libpng.mk
===================================================================
--- trunk/buildroot/package/libpng/libpng.mk 2009-02-26 20:57:29 UTC (rev 25467)
+++ trunk/buildroot/package/libpng/libpng.mk 2009-02-27 14:59:17 UTC (rev 25468)
@@ -3,7 +3,7 @@
# libpng (Portable Network Graphic library)
#
#############################################################
-LIBPNG_VERSION:=1.2.34
+LIBPNG_VERSION:=1.2.35
LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
LIBPNG_LIBTOOL_PATCH = NO
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2009-02-27 14:59 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-06 15:11 [Buildroot] svn commit: trunk/buildroot/package/libpng jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-02-27 14:59 jacmet at uclibc.org
2009-02-12 12:17 jacmet at uclibc.org
2009-01-12 12:45 laird at uclibc.org
2008-10-29 12:49 laird at uclibc.org
2008-10-29 13:53 ` Peter Korsgaard
2008-10-29 14:15 ` Daniel J Laird
2008-10-29 15:33 ` Daniel J Laird
2008-10-29 15:58 ` Peter Korsgaard
2008-03-05 13:35 sjhill at uclibc.org
2008-03-05 14:02 ` Peter Korsgaard
2008-03-05 14:06 ` sjhill at realitydiluted.com
2008-03-05 14:52 ` Peter Korsgaard
2008-03-04 11:36 jacmet at uclibc.org
2008-03-04 11:36 jacmet at uclibc.org
2008-02-28 13:46 sjhill at uclibc.org
2008-02-28 21:43 ` Ulf Samuelsson
2007-08-05 14:00 aldot at uclibc.org
2007-08-01 8:36 ulf at uclibc.org
2007-08-01 9:47 ` Hebbar
2007-07-29 7:14 ulf at uclibc.org
2007-02-03 18:47 andersen at uclibc.org
2007-01-11 7:26 andersen at uclibc.org
2007-01-10 10:29 andersen at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox