* [Buildroot] [PATCH 1/4] ccache: bump to 3.1
@ 2010-09-26 7:19 Martin Banky
2010-09-26 7:19 ` [Buildroot] [PATCH 2/4] pkg-config: bump to 0.25 Martin Banky
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Martin Banky @ 2010-09-26 7:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
toolchain/ccache/ccache-3.1-cannot-find-ar.patch | 11 +++++++++++
toolchain/ccache/ccache.mk | 17 +++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)
create mode 100644 toolchain/ccache/ccache-3.1-cannot-find-ar.patch
diff --git a/toolchain/ccache/ccache-3.1-cannot-find-ar.patch b/toolchain/ccache/ccache-3.1-cannot-find-ar.patch
new file mode 100644
index 0000000..a5b3b3f
--- /dev/null
+++ b/toolchain/ccache/ccache-3.1-cannot-find-ar.patch
@@ -0,0 +1,11 @@
+--- a/configure 2010-09-16 10:01:09.000000000 -0700
++++ b/configure 2010-09-23 20:14:34.000000000 -0700
+@@ -3347,7 +3347,7 @@ else
+ AR="$ac_cv_prog_AR"
+ fi
+
+-if test -z "$ac_ct_AR"; then
++if test -z "$AR"; then
+ as_fn_error "cannot find ar" "$LINENO" 5
+ fi
+
diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index 01d18fb..1fe24fe 100644
--- a/toolchain/ccache/ccache.mk
+++ b/toolchain/ccache/ccache.mk
@@ -3,14 +3,14 @@
# build ccache to make recompiles faster on the build system
#
#############################################################
-CCACHE_VER:=3.0.1
-CCACHE_SITE:=http://samba.org/ftp/ccache
-CCACHE_SOURCE:=ccache-$(CCACHE_VER).tar.gz
-CCACHE_DIR1:=$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)
-CCACHE_DIR2:=$(BUILD_DIR)/ccache-$(CCACHE_VER)
-CCACHE_CAT:=$(ZCAT)
-CCACHE_BINARY:=ccache
-CCACHE_TARGET_BINARY:=usr/bin/ccache
+CCACHE_VER = 3.1
+CCACHE_SITE = http://samba.org/ftp/ccache
+CCACHE_SOURCE = ccache-$(CCACHE_VER).tar.gz
+CCACHE_DIR1 = $(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)
+CCACHE_DIR2 = $(BUILD_DIR)/ccache-$(CCACHE_VER)
+CCACHE_CAT = $(ZCAT)
+CCACHE_BINARY = ccache
+CCACHE_TARGET_BINARY = usr/bin/ccache
$(DL_DIR)/$(CCACHE_SOURCE):
$(call DOWNLOAD,$(CCACHE_SITE),$(CCACHE_SOURCE))
@@ -141,6 +141,7 @@ $(CCACHE_DIR2)/.unpacked: $(DL_DIR)/$(CCACHE_SOURCE)
touch $@
$(CCACHE_DIR2)/.patched: $(CCACHE_DIR2)/.unpacked
+ toolchain/patch-kernel.sh $(CCACHE_DIR2) toolchain/ccache/ \*.patch
touch $@
$(CCACHE_DIR2)/.configured: $(CCACHE_DIR2)/.patched
--
1.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/4] pkg-config: bump to 0.25
2010-09-26 7:19 [Buildroot] [PATCH 1/4] ccache: bump to 3.1 Martin Banky
@ 2010-09-26 7:19 ` Martin Banky
2010-09-26 7:19 ` [Buildroot] [PATCH 3/4] libpng: bump to 1.4.4 Martin Banky
2010-09-26 7:19 ` [Buildroot] [PATCH 4/4] autoconf: bump to 2.68 Martin Banky
2 siblings, 0 replies; 5+ messages in thread
From: Martin Banky @ 2010-09-26 7:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
.../pkg-config/pkg-config-0.23-fix-sysroot.patch | 34 --------------------
package/pkg-config/pkg-config.mk | 2 +-
2 files changed, 1 insertions(+), 35 deletions(-)
delete mode 100644 package/pkg-config/pkg-config-0.23-fix-sysroot.patch
diff --git a/package/pkg-config/pkg-config-0.23-fix-sysroot.patch b/package/pkg-config/pkg-config-0.23-fix-sysroot.patch
deleted file mode 100644
index 3653811..0000000
--- a/package/pkg-config/pkg-config-0.23-fix-sysroot.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-[PATCH] fix PKG_CONFIG_SYSROOT_DIR handling
-
-With PKG_CONFIG_SYSROOT_DIR enabled, everything else than -L and -I words
-gets stripped away.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- pkg.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-Index: pkg-config-0.23/pkg.c
-===================================================================
---- pkg-config-0.23.orig/pkg.c
-+++ pkg-config-0.23/pkg.c
-@@ -472,17 +472,13 @@
- while (tmp != NULL)
- {
- char *tmpstr = (char*) tmp->data;
-- if (pcsysrootdir != NULL)
-+ if (pcsysrootdir != NULL && tmpstr[0] == '-' &&
-+ (tmpstr[1] == 'I' || tmpstr[1] == 'L'))
- {
-- if (tmpstr[0] == '-' &&
-- (tmpstr[1] == 'I' ||
-- tmpstr[1] == 'L'))
-- {
- g_string_append_c (str, '-');
- g_string_append_c (str, tmpstr[1]);
- g_string_append (str, pcsysrootdir);
- g_string_append (str, tmpstr+2);
-- }
- }
- else
- {
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index 7caf37b..76d7179 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -3,7 +3,7 @@
# pkgconfig
#
#############################################################
-PKG_CONFIG_VERSION = 0.23
+PKG_CONFIG_VERSION = 0.25
PKG_CONFIG_SOURCE = pkg-config-$(PKG_CONFIG_VERSION).tar.gz
PKG_CONFIG_SITE = http://pkgconfig.freedesktop.org/releases/
--
1.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/4] libpng: bump to 1.4.4
2010-09-26 7:19 [Buildroot] [PATCH 1/4] ccache: bump to 3.1 Martin Banky
2010-09-26 7:19 ` [Buildroot] [PATCH 2/4] pkg-config: bump to 0.25 Martin Banky
@ 2010-09-26 7:19 ` Martin Banky
2010-10-05 21:49 ` Peter Korsgaard
2010-09-26 7:19 ` [Buildroot] [PATCH 4/4] autoconf: bump to 2.68 Martin Banky
2 siblings, 1 reply; 5+ messages in thread
From: Martin Banky @ 2010-09-26 7:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/libpng/libpng.mk | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 5608f4f..82b88da 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -3,23 +3,22 @@
# libpng (Portable Network Graphic library)
#
#############################################################
-LIBPNG_VERSION:=1.2.44
+LIBPNG_VERSION = 1.4.4
+LIBPNG_SERIES = 14
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_CONF_OPT = --without-libpng-compat
LIBPNG_DEPENDENCIES = host-pkg-config zlib
-HOST_LIBPNG_CONF_OPT = --without-libpng-compat
HOST_LIBPNG_DEPENDENCIES = host-pkg-config host-zlib
define LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
$(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,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng$(LIBPNG_SERIES)\',g" \
-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
- $(STAGING_DIR)/usr/bin/libpng12-config
+ $(STAGING_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config
endef
LIBPNG_POST_INSTALL_STAGING_HOOKS += LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
--
1.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 4/4] autoconf: bump to 2.68
2010-09-26 7:19 [Buildroot] [PATCH 1/4] ccache: bump to 3.1 Martin Banky
2010-09-26 7:19 ` [Buildroot] [PATCH 2/4] pkg-config: bump to 0.25 Martin Banky
2010-09-26 7:19 ` [Buildroot] [PATCH 3/4] libpng: bump to 1.4.4 Martin Banky
@ 2010-09-26 7:19 ` Martin Banky
2 siblings, 0 replies; 5+ messages in thread
From: Martin Banky @ 2010-09-26 7:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/autoconf/autoconf.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index b1fc52d..9630550 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -3,7 +3,7 @@
# autoconf
#
#############################################################
-AUTOCONF_VERSION = 2.67
+AUTOCONF_VERSION = 2.68
AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2
AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
--
1.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/4] libpng: bump to 1.4.4
2010-09-26 7:19 ` [Buildroot] [PATCH 3/4] libpng: bump to 1.4.4 Martin Banky
@ 2010-10-05 21:49 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2010-10-05 21:49 UTC (permalink / raw)
To: buildroot
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-10-05 21:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-26 7:19 [Buildroot] [PATCH 1/4] ccache: bump to 3.1 Martin Banky
2010-09-26 7:19 ` [Buildroot] [PATCH 2/4] pkg-config: bump to 0.25 Martin Banky
2010-09-26 7:19 ` [Buildroot] [PATCH 3/4] libpng: bump to 1.4.4 Martin Banky
2010-10-05 21:49 ` Peter Korsgaard
2010-09-26 7:19 ` [Buildroot] [PATCH 4/4] autoconf: bump to 2.68 Martin Banky
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.