* [Buildroot] [git commit master 1/1] hdparm: needs largefile support
From: Peter Korsgaard @ 2010-10-05 10:08 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=c1d0fae7d0226f044ffab26965213d9785deca27
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/hdparm/Config.in | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/package/hdparm/Config.in b/package/hdparm/Config.in
index 1b57439..32bd247 100644
--- a/package/hdparm/Config.in
+++ b/package/hdparm/Config.in
@@ -1,6 +1,10 @@
config BR2_PACKAGE_HDPARM
bool "hdparm"
+ depends on BR2_LARGEFILE
help
hdparm - get/set hard disk parameters for Linux IDE drives.
http://www.ibiblio.org/pub/Linux/system/hardware/
+
+comment "hdparm requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] ipsec-tools: breaks with parallel builds
From: Peter Korsgaard @ 2010-10-05 10:08 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=f40cb9cb5474ffe06bf05371593c6a9a8ef0d330
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 10 +++++-----
package/ipsec-tools/ipsec-tools.mk | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CHANGES b/CHANGES
index 4a382a2..9ca8a29 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,11 +29,11 @@
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf,
gtk2-themes, gtkperf, gvfs, haserl, hdparm, hostapd, hwdata,
- ifplugd, imagemagick, iperf, iproute2, iptables, iw, jpeg,
- kexec, kismet, less, libcgi, libcurl, libdaemon, libdnet,
- liberation, libevent, libeXosip2, libglade, libgtk2, libiconv,
- libidn, libmms, libnl, liboil, libosip2, libpcap, libpng,
- libtool, libungif, libxml2, libxslt, lighttpd, lite,
+ ifplugd, imagemagick, iperf, ipsec-tools, iproute2, iptables,
+ iw, jpeg, kexec, kismet, less, libcgi, libcurl, libdaemon,
+ libdnet, liberation, libevent, libeXosip2, libglade, libgtk2,
+ libiconv, libidn, libmms, libnl, liboil, libosip2, libpcap,
+ libpng, libtool, libungif, libxml2, libxslt, lighttpd, lite,
lm-sensors, lockfile-progs, logrotate, m4, mdadm, mesa3d,
metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index eddc7ce..0861a05 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -8,6 +8,7 @@ IPSEC_TOOLS_VERSION = 0.7.3
IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
IPSEC_TOOLS_INSTALL_STAGING = YES
+IPSEC_TOOLS_MAKE = $(MAKE1)
IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
# configure hardcodes -Werror, so override CFLAGS on make invocation
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 05/10] microcom: convert to gentargets
From: Thomas Petazzoni @ 2010-10-05 9:21 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-5-git-send-email-Martin.Banky@gmail.com>
On Tue, 5 Oct 2010 01:22:38 -0700
Martin Banky <martin.banky@gmail.com> wrote:
> +define MICROCOM_CONFIGURE_CMDS
> + $(ZCAT) $(DL_DIR)/$(MICROCOM_SOURCE) | tar -C $(@D) $(TAR_OPTIONS) -
This sounds strange to me. The extraction is already done by the
package infrastructure.
> toolchain/patch-kernel.sh $(MICROCOM_DIR) package/microcom/ \*.patch
This as well.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 06/10] microperl: convert to gentargets
From: Thomas Petazzoni @ 2010-10-05 9:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-6-git-send-email-Martin.Banky@gmail.com>
Hello,
On Tue, 5 Oct 2010 01:22:39 -0700
Martin Banky <martin.banky@gmail.com> wrote:
> +define MICROPERL_CONFIGURE_CMDS
I am not a huge huge fan of this, because it's subverting the purpose
of MICROPERL_CONFIGURE_CMDS to do a more-or-less partial build of
microperl for the host. Do we really need such a partial build ? If so,
shouldn't we create a host-microperl package ?
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 01/10] input-tools: convert to gentargets
From: Thomas Petazzoni @ 2010-10-05 9:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
Hello,
Thanks Martin for doing all this conversion work, this is much
appreciated!
On Tue, 5 Oct 2010 01:22:34 -0700
Martin Banky <martin.banky@gmail.com> wrote:
> +define INPUT_TOOLS_DEBIAN_PATCHES
> + if [ -d $(@D)/debian/patches ]; then \
> + (cd $(@D)/debian/patches && for i in *; \
> + do $(SED) 's,^\+\+\+ .*joystick-$(INPUT_TOOLS_VERSION)/,+++ joystick-$(INPUT_TOOLS_VERSION)/,' $$i; \
I have seen this in several of your patches, but I don't understand why
it is here. There are several other packages that do apply the debian
patches, but such a sed step is not needed.
> +define INPUT_TOOLS_BUILD_CMDS
> + $(INPUT_TOOLS_DEBIAN_PATCHES)
Even though it doesn't technically make any difference, I'd prefer to
have this as a post-patch hook.
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 10/10] netplug: convert to gentargets and bump to 1.2.9.2
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/netplug/netplug-1.2.9-disable-werror.patch | 22 --------
.../netplug/netplug-1.2.9.2-makefile-flags.patch | 21 ++++++++
package/netplug/netplug-socklen-type.patch | 12 ----
package/netplug/netplug.mk | 54 ++++++--------------
4 files changed, 36 insertions(+), 73 deletions(-)
delete mode 100644 package/netplug/netplug-1.2.9-disable-werror.patch
create mode 100644 package/netplug/netplug-1.2.9.2-makefile-flags.patch
delete mode 100644 package/netplug/netplug-socklen-type.patch
diff --git a/package/netplug/netplug-1.2.9-disable-werror.patch b/package/netplug/netplug-1.2.9-disable-werror.patch
deleted file mode 100644
index d8a3e15..0000000
--- a/package/netplug/netplug-1.2.9-disable-werror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-netplug uses nested functions, and gcc generates a warning that
-is turned into an error:
-
-cc1: warnings being treated as errors
-if_info.c: In function 'ifsm_scriptdone':
-if_info.c:289: error: generating trampoline in object (requires executable stack)
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: netplug-1.2.9/Makefile
-===================================================================
---- netplug-1.2.9.orig/Makefile 2010-05-09 21:07:40.000000000 +0200
-+++ netplug-1.2.9/Makefile 2010-05-09 21:09:32.000000000 +0200
-@@ -9,7 +9,7 @@
-
- install_opts :=
-
--CFLAGS += -Wall -Werror -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
-+CFLAGS += -Wall -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
- -DNP_SCRIPT_DIR='"$(scriptdir)"' -ggdb3 -O3 -DNP_VERSION='"$(version)"'
-
- netplugd: config.o netlink.o lib.o if_info.o main.o
diff --git a/package/netplug/netplug-1.2.9.2-makefile-flags.patch b/package/netplug/netplug-1.2.9.2-makefile-flags.patch
new file mode 100644
index 0000000..b2468f8
--- /dev/null
+++ b/package/netplug/netplug-1.2.9.2-makefile-flags.patch
@@ -0,0 +1,21 @@
+Preserve the cflags settings, because buildroot clobbers them.
+
+--- a/Makefile 2010-10-05 00:06:38.000000000 -0700
++++ b/Makefile 2010-10-05 00:15:27.000000000 -0700
+@@ -11,11 +11,14 @@ mandir ?= $(prefix)/usr/share/man
+
+ install_opts :=
+
+-CFLAGS += -Wall -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
++NETPLUG_CFLAGS += -Wall -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
+ -DNP_SCRIPT_DIR='"$(scriptdir)"' -ggdb3 -O3 -DNP_VERSION='"$(version)"'
+
++%.o: %.c
++ $(CC) $(NETPLUG_CFLAGS) $(CFLAGS) -c -o $@ $<
++
+ netplugd: config.o netlink.o lib.o if_info.o main.o
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $(NETPLUG_CFLAGS) $^
+
+ install:
+ install -d $(install_opts) -m 755 \
diff --git a/package/netplug/netplug-socklen-type.patch b/package/netplug/netplug-socklen-type.patch
deleted file mode 100644
index 1e36988..0000000
--- a/package/netplug/netplug-socklen-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur netplug-1.2.9/netlink.c netplug-1.2.9-patched/netlink.c
---- netplug-1.2.9/netlink.c 2005-01-07 23:57:09.000000000 -0600
-+++ netplug-1.2.9-patched/netlink.c 2008-02-27 20:18:09.855767996 -0600
-@@ -284,7 +284,7 @@
- exit(1);
- }
-
-- int addr_len = sizeof(addr);
-+ socklen_t addr_len = sizeof(addr);
-
- if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) {
- do_log(LOG_ERR, "Could not get socket details: %m");
diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk
index 74fa0c5..a411d86 100644
--- a/package/netplug/netplug.mk
+++ b/package/netplug/netplug.mk
@@ -3,51 +3,27 @@
# netplug
#
#############################################################
-NETPLUG_VERSION=1.2.9
+NETPLUG_VERSION=1.2.9.2
NETPLUG_SOURCE=netplug-$(NETPLUG_VERSION).tar.bz2
NETPLUG_SITE=http://www.red-bean.com/~bos/netplug
-NETPLUG_DIR=$(BUILD_DIR)/netplug-$(NETPLUG_VERSION)
-NETPLUG_CAT:=$(BZCAT)
-NETPLUG_BINARY:=netplugd
-NETPLUG_TARGET_BINARY:=sbin/netplugd
-$(DL_DIR)/$(NETPLUG_SOURCE):
- $(call DOWNLOAD,$(NETPLUG_SITE),$(NETPLUG_SOURCE))
+define NETPLUG_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
-netplug-source: $(DL_DIR)/$(NETPLUG_SOURCE)
+define NETPLUG_INSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
-$(NETPLUG_DIR)/.unpacked: $(DL_DIR)/$(NETPLUG_SOURCE)
- $(NETPLUG_CAT) $(DL_DIR)/$(NETPLUG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(NETPLUG_DIR) package/netplug/ netplug\*.patch
- touch $(NETPLUG_DIR)/.unpacked
-
-$(NETPLUG_DIR)/$(NETPLUG_BINARY): $(NETPLUG_DIR)/.unpacked
- $(MAKE) CC="$(TARGET_CC)" -C $(NETPLUG_DIR)
- $(STRIPCMD) $(NETPLUG_DIR)/$(NETPLUG_BINARY)
-
-$(TARGET_DIR)/$(NETPLUG_TARGET_BINARY): $(NETPLUG_DIR)/$(NETPLUG_BINARY)
- $(INSTALL) -m 644 -D $(NETPLUG_DIR)/etc/netplugd.conf $(TARGET_DIR)/etc/netplug/netplugd.conf
- $(INSTALL) -m 755 -D package/netplug/netplug-script $(TARGET_DIR)/etc/netplug.d/netplug
- $(INSTALL) -m 755 -D package/netplug/S29netplug $(TARGET_DIR)/etc/init.d
- $(INSTALL) -m 755 -D $(NETPLUG_DIR)/$(NETPLUG_BINARY) $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY)
- touch -c $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY)
-
-netplug: $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY)
-
-netplug-clean:
- rm -f $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY)
+define NETPLUG_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/sbin/netplugd
rm -rf $(TARGET_DIR)/etc/netplug*
rm -f $(TARGET_DIR)/etc/init.d/S*netplug
- -$(MAKE) -C $(NETPLUG_DIR) clean
+endef
-netplug-dirclean:
- rm -rf $(NETPLUG_DIR)
+define NETPLUG_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NETPLUG),y)
-TARGETS+=netplug
-endif
+$(eval $(call GENTARGETS,package,netplug))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 09/10] mplayer: convert to gentargets
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
Would have bumped the version, but someone smarter than me is going to have to
do it.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/multimedia/mplayer/mplayer.mk | 88 +++++++++++---------------------
1 files changed, 30 insertions(+), 58 deletions(-)
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index ac3a67e..a53c687 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -3,67 +3,54 @@
# mplayer
#
#############################################################
-MPLAYER_VERSION:=1.0rc2
-MPLAYER_SOURCE:=MPlayer-$(MPLAYER_VERSION).tar.bz2
-MPLAYER_SITE:=http://www7.mplayerhq.hu/MPlayer/releases
-MPLAYER_DIR:=$(BUILD_DIR)/MPlayer-$(MPLAYER_VERSION)
-MPLAYER_CAT:=$(BZCAT)
-MPLAYER_BINARY:=mplayer
-MPLAYER_TARGET_BINARY:=usr/bin/$(MPLAYER_BINARY)
+MPLAYER_VERSION = 1.0rc2
+MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.bz2
+MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
MPLAYER_DEPENDENCIES = \
$(if $(BR2_PACKAGE_LIBMAD),libmad) \
$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib)
ifeq ($(BR2_ENDIAN),"BIG")
-MPLAYER_ENDIAN:=--enable-big-endian
+MPLAYER_CONF_OPTS += --enable-big-endian
else
-MPLAYER_ENDIAN:=--disable-big-endian
+MPLAYER_CONF_OPTS += --disable-big-endian
endif
-# mplayer unfortunately uses --disable-largefileS, so we cannot use
+# mplayer unfortunately uses --disable-largefiles, so we cannot use
# DISABLE_LARGEFILE
ifeq ($(BR2_LARGEFILE),y)
-MPLAYER_LARGEFILE:=--enable-largefiles
+MPLAYER_CONF_OPTS += --enable-largefiles
else
# dvdread/dvdcss requires largefile support
-MPLAYER_LARGEFILE:=--disable-largefiles \
+MPLAYER_CONF_OPTS += --disable-largefiles \
--disable-dvdread-internal \
--disable-libdvdcss-internal
endif
ifeq ($(BR2_PACKAGE_SDL),y)
-MPLAYER_SDL:=--enable-sdl --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config
+MPLAYER_CONF_OPTS += --enable-sdl --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config
MPLAYER_DEPENDENCIES += sdl
else
-MPLAYER_SDL:=--disable-sdl
+MPLAYER_CONF_OPTS += --disable-sdl
endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
-MPLAYER_FREETYPE:= \
+MPLAYER_CONF_OPTS += \
--enable-freetype \
--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
MPLAYER_DEPENDENCIES += freetype
else
-MPLAYER_FREETYPE:=--disable-freetype
+MPLAYER_CONF_OPTS += --disable-freetype
endif
ifeq ($(BR2_i386),y)
# This seems to be required to compile some of the inline asm
-MPLAYER_CFLAGS:=-fomit-frame-pointer
+MPLAYER_CFLAGS = -fomit-frame-pointer
endif
-$(DL_DIR)/$(MPLAYER_SOURCE):
- $(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE))
-
-$(MPLAYER_DIR)/.unpacked: $(DL_DIR)/$(MPLAYER_SOURCE)
- $(MPLAYER_CAT) $(DL_DIR)/$(MPLAYER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(MPLAYER_DIR) package/multimedia/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\*
- $(CONFIG_UPDATE) $(MPLAYER_DIR)
- touch $@
-
-$(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
- (cd $(MPLAYER_DIR); rm -rf config.cache; \
+define MPLAYER_CONFIGURE_CMDS
+ (cd $(@D); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
CFLAGS="$(TARGET_CFLAGS) $(MPLAYER_CFLAGS)" \
@@ -80,44 +67,29 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
--charset=UTF-8 \
--enable-mad \
--enable-fbdev \
- $(MPLAYER_ENDIAN) \
- $(MPLAYER_LARGEFILE) \
- $(MPLAYER_SDL) \
- $(MPLAYER_FREETYPE) \
+ $(MPLAYER_CONF_OPTS) \
--enable-cross-compile \
--disable-ivtv \
--disable-tv \
--disable-live \
--enable-dynamic-plugins \
)
- touch $@
-
-$(MPLAYER_DIR)/$(MPLAYER_BINARY): $(MPLAYER_DIR)/.configured
- $(MAKE1) -C $(MPLAYER_DIR)
- touch -c $@
+endef
-$(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY)
- $(INSTALL) -m 0755 -D $(MPLAYER_DIR)/$(MPLAYER_BINARY) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
- touch -c $@
+define MPLAYER_BUILD_CMDS
+ $(MAKE1) -C $(@D)
+endef
-mplayer: $(MPLAYER_DEPENDENCIES) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
+define MPLAYER_INSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
-mplayer-source: $(DL_DIR)/$(MPLAYER_SOURCE)
+define MPLAYER_UNINSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
+endef
-mplayer-unpacked: $(MPLAYER_DIR)/.unpacked
+define MPLAYER_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
-mplayer-clean:
- rm -f $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
- -$(MAKE) -C $(MPLAYER_DIR) clean
-
-mplayer-dirclean:
- rm -rf $(MPLAYER_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MPLAYER),y)
-TARGETS+=mplayer
-endif
+$(eval $(call GENTARGETS,package/multimedia,mplayer))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 08/10] alsa-utils: convert to autotargets and bump to 1.0.23
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/multimedia/alsa-utils/alsa-utils.mk | 96 ++++++---------------------
1 files changed, 20 insertions(+), 76 deletions(-)
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 3d1b0ef..9bac6b8 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -3,52 +3,23 @@
# alsa-utils
#
#############################################################
-ALSA_UTILS_VERSION:=1.0.22
-ALSA_UTILS_SOURCE:=alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
-ALSA_UTILS_SITE:=ftp://ftp.alsa-project.org/pub/utils
-ALSA_UTILS_DIR:=$(BUILD_DIR)/alsa-utils-$(ALSA_UTILS_VERSION)
-ALSA_UTILS_CAT:=$(BZCAT)
-ALSA_UTILS_BINARY:=alsactl/alsactl
-ALSA_UTILS_TARGET_BINARY:=usr/sbin/alsactl
+ALSA_UTILS_VERSION = 1.0.23
+ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
+ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
+ALSA_UTILS_INSTALL_STAGING = YES
+ALSA_UTILS_DEPENDENCIES = alsa-lib \
+ $(if $(BR2_PACKAGE_NCURSES),ncurses) \
+ $(if $(BR2_PACKAGE_LIBINTL),libintl) \
+ $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-ALSA_UTILS_CONFIGURE_OPTS =
-ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y)
-ALSA_UTILS_CONFIGURE_OPTS += --disable-alsamixer --disable-alsatest
-endif
-
-$(DL_DIR)/$(ALSA_UTILS_SOURCE):
- $(call DOWNLOAD,$(ALSA_UTILS_SITE),$(ALSA_UTILS_SOURCE))
-
-$(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE)
- $(ALSA_UTILS_CAT) $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch
- $(CONFIG_UPDATE) $(ALSA_UTILS_DIR)
- touch $@
+ALSA_UTILS_CONF_ENV = ac_cv_prog_ncurses5_config=$(STAGING_DIR)/bin/ncurses5-config
-$(ALSA_UTILS_DIR)/.configured: $(ALSA_UTILS_DIR)/.unpacked
- (cd $(ALSA_UTILS_DIR); rm -f config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- ac_cv_prog_ncurses5_config=$(STAGING_DIR)/bin/ncurses5-config \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- $(ALSA_UTILS_CONFIGURE_OPTS) \
- --disable-xmlto \
- --with-curses=ncurses \
- )
- touch $@
+ALSA_UTILS_CONF_OPT = --disable-xmlto \
+ --with-curses=ncurses
-$(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY): $(ALSA_UTILS_DIR)/.configured
- $(MAKE) CC="$(TARGET_CC)" -C $(ALSA_UTILS_DIR)
- touch -c $@
-
-ALSA_UTILS_TARGETS_ :=
-ALSA_UTILS_TARGETS_y :=
+ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y)
+ALSA_UTILS__CONF_OPT += --disable-alsamixer --disable-alsatest
+endif
ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf
ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACTL) += usr/sbin/alsactl
@@ -65,13 +36,10 @@ ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQDUMP) += usr/bin/aseqdump
ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQNET) += usr/bin/aseqnet
ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST) += usr/bin/speaker-test
-$(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(ALSA_UTILS_DIR) install
- mkdir -p $(TARGET_DIR)/usr/bin
- mkdir -p $(TARGET_DIR)/usr/sbin
- for file in $(ALSA_UTILS_TARGETS_y); do \
- cp -dpf $(STAGING_DIR)/$$file $(TARGET_DIR)/$$file; \
- done
+define ALSA_UTILS_INSTALL_TARGET_CMDS
+ test -z "$(ALSA_UTILS_INSTALL_FILES_y)" || \
+ install -D -m 755 $(addprefix $(STAGING_DIR)/,$(ALSA_UTILS_TARGETS_y)) \
+ $(TARGET_DIR)/usr/bin/
if [ -x "$(TARGET_DIR)/usr/bin/speaker-test" ]; then \
mkdir -p $(TARGET_DIR)/usr/share/alsa/speaker-test; \
mkdir -p $(TARGET_DIR)/usr/share/sounds/alsa; \
@@ -83,30 +51,6 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY
rm -rf $(TARGET_DIR)/usr/share/alsa/; \
cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
fi
- touch -c $@
-
-alsa-utils: alsa-lib $(if $(BR2_PACKAGE_NCURSES),ncurses) $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY)
+endef
-alsa-utils-unpacked: $(ALSA_UTILS_DIR)/.unpacked
-
-alsa-utils-source: $(DL_DIR)/$(ALSA_UTILS_SOURCE)
-
-alsa-utils-clean:
- for file in $(ALSA_UTILS_TARGETS_y); do \
- rm -f $(TARGET_DIR)/$$file; \
- done
- for file in $(ALSA_UTILS_TARGETS_); do \
- rm -f $(TARGET_DIR)/$$file; \
- done
- -$(MAKE) -C $(ALSA_UTILS_DIR) clean
-
-alsa-utils-dirclean:
- rm -rf $(ALSA_UTILS_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_ALSA_UTILS),y)
-TARGETS+=alsa-utils
-endif
+$(eval $(call AUTOTARGETS,package/multimedia,alsa-utils))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 07/10] mii-diag: convert to gentargets and bump to 2.11.3
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/mii-diag/mii-diag.mk | 80 ++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 50 deletions(-)
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index ba01c0e..8870073 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -3,59 +3,39 @@
# mii-diag
#
#############################################################
-MIIDIAG_VERSION:=2.11
-MIIDIAG_DEBIAN_PATCH_LEVEL:=2
-MIIDIAG_SOURCE:=mii-diag_$(MIIDIAG_VERSION).orig.tar.gz
-MIIDIAG_PATCH_FILE=mii-diag_$(MIIDIAG_VERSION)-$(MIIDIAG_DEBIAN_PATCH_LEVEL).diff.gz
-MIIDIAG_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
-MIIDIAG_DIR:=$(BUILD_DIR)/mii-diag-$(MIIDIAG_VERSION)
-MIIDIAG_CAT:=$(ZCAT)
-MIIDIAG_BINARY:=usr/sbin/mii-diag
-
-ifneq ($(MIIDIAG_PATCH_FILE),)
-MIIDIAG_PATCH=$(DL_DIR)/$(MIIDIAG_PATCH_FILE)
-$(MIIDIAG_PATCH):
- $(call DOWNLOAD,$(MIIDIAG_SITE),$(MIIDIAG_PATCH_FILE))
-endif
-
-$(DL_DIR)/$(MIIDIAG_SOURCE):
- $(call DOWNLOAD,$(MIIDIAG_SITE),$(MIIDIAG_SOURCE))
-
-$(MIIDIAG_DIR)/.unpacked: $(DL_DIR)/$(MIIDIAG_SOURCE) $(MIIDIAG_PATCH)
- mkdir -p $(MIIDIAG_DIR)
- $(MIIDIAG_CAT) $(DL_DIR)/$(MIIDIAG_SOURCE) | tar --strip 1 -C $(MIIDIAG_DIR) $(TAR_OPTIONS) -
-ifneq ($(MIIDIAG_PATCH_FILE),)
- (cd $(MIIDIAG_DIR) && $(MIIDIAG_CAT) $(MIIDIAG_PATCH) | patch -p1)
+MII_DIAG_VERSION = 2.11
+MII_DIAG_SOURCE = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
+MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
+MII_DIAG_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
+
+ifneq ($(MII_DIAG_PATCH),)
+define MII_DIAG_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ (cd $(@D)/debian/patches && for i in *; \
+ do $(SED) 's,^\+\+\+ .*mii-diag-$(MII_DIAG_VERSION)/,+++ mii-diag-$(MII_DIAG_VERSION)/,' $$i; \
+ done; \
+ ); \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+ fi
+endef
endif
- toolchain/patch-kernel.sh $(MIIDIAG_DIR) package/mii-diag/ mii-diag-\*.patch*
- touch $@
-
-$(MIIDIAG_DIR)/.configured: $(MIIDIAG_DIR)/.unpacked
- touch $@
-
-$(MIIDIAG_DIR)/mii-diag: $(MIIDIAG_DIR)/.configured
- $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(MIIDIAG_DIR)
-$(TARGET_DIR)/$(MIIDIAG_BINARY): $(MIIDIAG_DIR)/mii-diag
- $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(MIIDIAG_DIR) DESTDIR=$(TARGET_DIR) install
- $(STRIPCMD) $@
- touch $@
+define MII_DIAG_BUILD_CMDS
+ $(MII_DIAG_DEBIAN_PATCHES)
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
-mii-diag: $(TARGET_DIR)/$(MIIDIAG_BINARY)
+define MII_DIAG_INSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
-mii-diag-source: $(DL_DIR)/$(MIIDIAG_SOURCE) $(MIIDIAG_PATCH)
+define MII_DIAG_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/mii-diag
+endef
-mii-diag-clean:
- -$(MAKE) -C $(MIIDIAG_DIR) clean
+define MII_DIAG_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
-mii-diag-dirclean:
- rm -rf $(MIIDIAG_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MIIDIAG),y)
-TARGETS+=mii-diag
-endif
+$(eval $(call GENTARGETS,package,mii-diag))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 06/10] microperl: convert to gentargets
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/microperl/microperl.mk | 145 ++++++++++++++-------------------------
1 files changed, 52 insertions(+), 93 deletions(-)
diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index bf76fa7..5b18606 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -3,122 +3,81 @@
# microperl
#
#############################################################
-MICROPERL_MAJ=5
-MICROPERL_VERSION=$(MICROPERL_MAJ).8.8
+MICROPERL_VERSION=5.8.8
MICROPERL_SOURCE=perl-$(MICROPERL_VERSION).tar.bz2
-MICROPERL_CAT:=$(BZCAT)
MICROPERL_SITE=ftp://ftp.cpan.org/pub/CPAN/src/5.0
-MICROPERL_DIR=$(BUILD_DIR)/perl-$(MICROPERL_VERSION)
-MICROPERL_MODS_DIR=/usr/lib/perl$(MICROPERL_MAJ)/$(MICROPERL_VERSION)
+MICROPERL_MODS_DIR=/usr/lib/perl5/$(MICROPERL_VERSION)
MICROPERL_MODS=$(call qstrip,$(BR2_PACKAGE_MICROPERL_MODULES))
+
ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
MICROPERL_MODS+=File/Basename.pm Errno.pm Config.pm IO/File.pm Symbol.pm \
SelectSaver.pm IO/Seekable.pm IO/Handle.pm IO.pm XSLoader.pm \
DynaLoader.pm AutoLoader.pm Carp/Heavy.pm
endif
-$(DL_DIR)/$(MICROPERL_SOURCE):
- $(call DOWNLOAD,$(MICROPERL_SITE),$(MICROPERL_SOURCE))
-$(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
- $(MICROPERL_CAT) $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+define MICROPERL_CONFIGURE_CMDS
# makedepend contains bashisms
$(SED) 's~sh ./makedepend~bash ./makedepend~' \
- $(MICROPERL_DIR)/Makefile.SH \
- $(MICROPERL_DIR)/x2p/Makefile.SH \
- $(MICROPERL_DIR)/pod/Makefile.SH
- chmod -R u+w $(MICROPERL_DIR)
- touch $@
-
-$(MICROPERL_DIR)/.host_configured: $(MICROPERL_DIR)/.source
+ $(@D)/Makefile.SH \
+ $(@D)/x2p/Makefile.SH \
+ $(@D)/pod/Makefile.SH
+ chmod -R u+w $(@D)
# we need to build a perl for the host just for Errno.pm
- (cd $(MICROPERL_DIR); ./Configure -Dcc=$(HOSTCC) -de )
- touch $@
-
-
-$(MICROPERL_DIR)/.host_configured_and_fixed: $(MICROPERL_DIR)/.host_configured
- $(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/Makefile
- $(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/x2p/Makefile
- $(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/makefile
- $(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/x2p/makefile
- touch $@
-
-$(MICROPERL_DIR)/.host_make: $(MICROPERL_DIR)/.host_configured_and_fixed
- $(MAKE) -C $(MICROPERL_DIR) || echo "An error is expected on make"
- touch $@
-
-$(MICROPERL_DIR)/.host_make_fixed: $(MICROPERL_DIR)/.host_make
- $(MAKE) -C $(MICROPERL_DIR) test || echo "An error is expected on make test"
- touch $@
-
-$(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.host_make_fixed
+ (cd $(@D); ./Configure -Dcc=$(HOSTCC) -de )
+ $(SED) 's/^.*<command-line>.*//g' $(@D)/Makefile
+ $(SED) 's/^.*<command-line>.*//g' $(@D)/x2p/Makefile
+ $(SED) 's/^.*<command-line>.*//g' $(@D)/makefile
+ $(SED) 's/^.*<command-line>.*//g' $(@D)/x2p/makefile
+endef
+
+define MICROPERL_BUILD_CMDS
+ $(MAKE) -C $(@D) || echo "An error is expected on make"
+ $(MAKE) -C $(@D) test || echo "An error is expected on make test"
# we need to build a perl for the host just for Errno.pm
- (cd $(MICROPERL_DIR); \
- chmod a+x ext/util/make_ext; \
- ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))" \
+ (cd $(@D); \
+ chmod a+x ext/util/make_ext; \
+ ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))" \
)
- (cd $(MICROPERL_DIR); \
- chmod u+w uconfig.h; ./uconfig.sh; \
- $(MAKE) -f $(MICROPERL_DIR)/Makefile.micro regen_uconfig; \
- $(SED) 's,PRIVLIB ".*,PRIVLIB "/$(MICROPERL_MODS_DIR)",' \
- -e 's,PRIVLIB_EXP ".*,PRIVLIB_EXP "$(MICROPERL_MODS_DIR)",' \
- -e 's,BIN ".*,BIN "/usr/bin",' \
- ./uconfig.h; \
+ (cd $(@D); \
+ chmod u+w uconfig.h; ./uconfig.sh; \
+ $(MAKE) -f $(@D)/Makefile.micro regen_uconfig; \
+ $(SED) 's,PRIVLIB ".*,PRIVLIB "/$(MICROPERL_MODS_DIR)",' \
+ -e 's,PRIVLIB_EXP ".*,PRIVLIB_EXP "$(MICROPERL_MODS_DIR)",' \
+ -e 's,BIN ".*,BIN "/usr/bin",' \
+ ./uconfig.h; \
)
- touch $@
-
-$(MICROPERL_DIR)/microperl: $(MICROPERL_DIR)/.configured
- $(MAKE) -f $(MICROPERL_DIR)/Makefile.micro CC="$(TARGET_CC)" \
- OPTIMIZE="$(TARGET_CFLAGS)" -C $(MICROPERL_DIR)
-ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
- #(cd $(@D); \
- # CONFIG=uconfig.h $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))"; \
- #)
-endif
+ $(MAKE) -f $(@D)/Makefile.micro CC="$(TARGET_CC)" \
+ OPTIMIZE="$(TARGET_CFLAGS)" -C $(@D)
+endef
-$(TARGET_DIR)/usr/bin/microperl: $(MICROPERL_DIR)/microperl
ifneq ($(MICROPERL_MODS),)
- (cd $(MICROPERL_DIR); \
- for i in $(patsubst %,$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/%,$(dir $(MICROPERL_MODS))); do \
- [ -d $$i ] || mkdir -p $$i; \
- done; \
- for i in $(MICROPERL_MODS); do \
- cp -dpf $(MICROPERL_DIR)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
- done; \
+define MICROPERL_INSTALL_MODS
+ (cd $(@D); \
+ for i in $(patsubst %,$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/%,$(dir $(MICROPERL_MODS))); do \
+ [ -d $$i ] || mkdir -p $$i; \
+ done; \
+ for i in $(MICROPERL_MODS); do \
+ install -D -m 644 $(@D)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
+ done; \
)
+endef
endif
- cp -dpf $(MICROPERL_DIR)/microperl $@
-ifneq ($(BR2_STRIP_none),y)
- $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-endif
- (cd $(TARGET_DIR)/usr/bin; rm -f perl; ln -s microperl perl;)
-microperl: $(TARGET_DIR)/usr/bin/microperl
-
-microperl-source: $(DL_DIR)/$(MICROPERL_SOURCE)
-
-microperl-unpacked: $(MICROPERL_DIR)/.source
-
-microperl-config: $(MICROPERL_DIR)/.host_configured
-
-microperl-host: $(MICROPERL_DIR)/.host_make
-
-microperl-host-fixed: $(MICROPERL_DIR)/.host_make_fixed
+define MICROPERL_INSTALL_TARGET_CMDS
+ $(MICROPERL_INSTALL_MODS)
+ install -D -m 755 $(@D)/microperl $(TARGET_DIR)/usr/bin/microperl
+ (cd $(TARGET_DIR)/usr/bin; rm -f perl; ln -s microperl perl;)
+endef
-microperl-clean:
+define MICROPERL_UNINSTALL_TARGET_CMDS
rm -rf $(TARGET_DIR)/usr/bin/microperl \
$(TARGET_DIR)/$(MICROPERL_MODS_DIR) $(TARGET_DIR)/usr/bin/perl
- -rmdir $(TARGET_DIR)/usr/lib/perl$(MICROPERL_MAJ)
- -$(MAKE) -C $(MICROPERL_DIR) -f Makefile.micro clean
+ -rmdir $(TARGET_DIR)/usr/lib/perl5
+endef
-microperl-dirclean:
- rm -rf $(MICROPERL_DIR)
+define MICROPERL_CLEAN_CMDS
+ -$(MAKE) -C $(@D) -f Makefile.micro clean
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MICROPERL),y)
-TARGETS+=microperl
-endif
+$(eval $(call GENTARGETS,package,microperl))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 05/10] microcom: convert to gentargets
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
The microcom archive is a flat archive, so the Makefile.package.in extract
function fails to extract any files. The $(TAR_STRIP_COMPONENTS)=1 seems to
strip the file names off.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
.../microcom/-microcom-102-001-speed-defines.patch | 34 ++++++++
.../-microcom-102-002-rename-variable-log.patch | 78 +++++++++++++++++++
.../microcom/microcom-102-001-speed-defines.patch | 34 --------
.../microcom-102-002-rename-variable-log.patch | 78 -------------------
package/microcom/microcom.mk | 80 +++++--------------
5 files changed, 133 insertions(+), 171 deletions(-)
create mode 100644 package/microcom/-microcom-102-001-speed-defines.patch
create mode 100644 package/microcom/-microcom-102-002-rename-variable-log.patch
delete mode 100644 package/microcom/microcom-102-001-speed-defines.patch
delete mode 100644 package/microcom/microcom-102-002-rename-variable-log.patch
diff --git a/package/microcom/-microcom-102-001-speed-defines.patch b/package/microcom/-microcom-102-001-speed-defines.patch
new file mode 100644
index 0000000..b9aece8
--- /dev/null
+++ b/package/microcom/-microcom-102-001-speed-defines.patch
@@ -0,0 +1,34 @@
+diff -rdup microcom-1.02.orig/help.c microcom-1.02/help.c
+--- microcom-1.02.orig/help.c 2000-07-30 06:15:47.000000000 +0200
++++ microcom-1.02/help.c 2007-01-19 19:44:19.000000000 +0100
+@@ -273,12 +273,29 @@ static void help_set_speed(int fd, char
+ B19200,
+ B38400,
+ B57600,
++#if defined B115200
+ B115200,
++#endif
++#if defined B230400
+ B230400,
++#endif
++#if defined B460800
+ B460800
++#endif
+ };
++#undef __STOPCHAR
++#if defined B115200
++#define __STOPCHAR 'h'
++#endif
++#if defined B230400
++#define __STOPCHAR 'i'
++#endif
++#if defined B460800
++#define __STOPCHAR 'j'
++#endif
+
+- if (c < 'a' && c > 'j') {
++
++ if (c < 'a' && c > __STOPCHAR) {
+ if (c == '~') {
+ help_speed();
+ return;
diff --git a/package/microcom/-microcom-102-002-rename-variable-log.patch b/package/microcom/-microcom-102-002-rename-variable-log.patch
new file mode 100644
index 0000000..8516b56
--- /dev/null
+++ b/package/microcom/-microcom-102-002-rename-variable-log.patch
@@ -0,0 +1,78 @@
+diff -rdup microcom-1.02.speed/help.c microcom-1.02/help.c
+--- microcom-1.02.speed/help.c 2007-01-19 19:44:19.000000000 +0100
++++ microcom-1.02/help.c 2007-01-19 19:48:20.000000000 +0100
+@@ -23,7 +23,7 @@ extern int crnl_mapping; //0 - no mappin
+ extern int script; /* script active flag */
+ extern char scr_name[MAX_SCRIPT_NAME]; /* default name of the script */
+ extern char device[MAX_DEVICE_NAME]; /* serial device name */
+-extern int log; /* log active flag */
++extern int log_active; /* log active flag */
+ extern FILE* flog; /* log file */
+
+ static int help_state = 0;
+@@ -85,7 +85,7 @@ static void help_escape(void) {
+
+ write(STDOUT_FILENO, str1, strlen(str1));
+
+- if (log == 0)
++ if (log_active == 0)
+ write(STDOUT_FILENO, " l - log on \n", 26);
+ else
+ write(STDOUT_FILENO, " l - log off \n", 26);
+@@ -156,11 +156,11 @@ static void help_send_escape(int fd, cha
+ case 'q': /* quit help */
+ break;
+ case 'l': /* log on/off */
+- log = (log == 0)? 1: 0;
+- if (log) { /* open log file */
++ log_active = (log_active == 0)? 1: 0;
++ if (log_active) { /* open log file */
+ if ((flog = fopen("microcom.log", "a")) == (FILE *)0) {
+ write(STDOUT_FILENO, "Cannot open microcom.log \n", 26);
+- log = 0;
++ log_active = 0;
+ }
+ }
+ else { /* cloase log file */
+diff -rdup microcom-1.02.speed/microcom.c microcom-1.02/microcom.c
+--- microcom-1.02.speed/microcom.c 2000-08-27 17:22:47.000000000 +0200
++++ microcom-1.02/microcom.c 2007-01-19 19:48:37.000000000 +0100
+@@ -25,7 +25,7 @@ int crnl_mapping; //0 - no mapping, 1 ma
+ int script = 0; /* script active flag */
+ char scr_name[MAX_SCRIPT_NAME] = "script.scr"; /* default name of the script */
+ char device[MAX_DEVICE_NAME]; /* serial device name */
+-int log = 0; /* log active flag */
++int log_active = 0; /* log active flag */
+ FILE* flog; /* log file */
+ int pf = 0; /* port file descriptor */
+ struct termios pots; /* old port termios settings to restore */
+@@ -106,7 +106,7 @@ void main_usage(int exitcode, char *str,
+ /* restore original terminal settings on exit */
+ void cleanup_termios(int signal) {
+ /* cloase the log file first */
+- if (log) {
++ if (log_active) {
+ fflush(flog);
+ fclose(flog);
+ }
+diff -rdup microcom-1.02.speed/mux.c microcom-1.02/mux.c
+--- microcom-1.02.speed/mux.c 2000-07-30 06:15:47.000000000 +0200
++++ microcom-1.02/mux.c 2007-01-19 19:48:48.000000000 +0100
+@@ -24,7 +24,7 @@
+
+ extern int script;
+ extern char scr_name[];
+-extern int log;
++extern int log_active;
+ extern FILE* flog;
+
+ void mux_clear_sflag(void) {
+@@ -71,7 +71,7 @@ void mux_loop(int pf) {
+ i = read(pf, buf, BUFSIZE);
+ if (i > 0) {
+ write(STDOUT_FILENO, buf, i);
+- if (log)
++ if (log_active)
+ fwrite(buf, 1, i, flog);
+ if (script) {
+ i = script_process(S_DCE, buf, i);
diff --git a/package/microcom/microcom-102-001-speed-defines.patch b/package/microcom/microcom-102-001-speed-defines.patch
deleted file mode 100644
index b9aece8..0000000
--- a/package/microcom/microcom-102-001-speed-defines.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rdup microcom-1.02.orig/help.c microcom-1.02/help.c
---- microcom-1.02.orig/help.c 2000-07-30 06:15:47.000000000 +0200
-+++ microcom-1.02/help.c 2007-01-19 19:44:19.000000000 +0100
-@@ -273,12 +273,29 @@ static void help_set_speed(int fd, char
- B19200,
- B38400,
- B57600,
-+#if defined B115200
- B115200,
-+#endif
-+#if defined B230400
- B230400,
-+#endif
-+#if defined B460800
- B460800
-+#endif
- };
-+#undef __STOPCHAR
-+#if defined B115200
-+#define __STOPCHAR 'h'
-+#endif
-+#if defined B230400
-+#define __STOPCHAR 'i'
-+#endif
-+#if defined B460800
-+#define __STOPCHAR 'j'
-+#endif
-
-- if (c < 'a' && c > 'j') {
-+
-+ if (c < 'a' && c > __STOPCHAR) {
- if (c == '~') {
- help_speed();
- return;
diff --git a/package/microcom/microcom-102-002-rename-variable-log.patch b/package/microcom/microcom-102-002-rename-variable-log.patch
deleted file mode 100644
index 8516b56..0000000
--- a/package/microcom/microcom-102-002-rename-variable-log.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -rdup microcom-1.02.speed/help.c microcom-1.02/help.c
---- microcom-1.02.speed/help.c 2007-01-19 19:44:19.000000000 +0100
-+++ microcom-1.02/help.c 2007-01-19 19:48:20.000000000 +0100
-@@ -23,7 +23,7 @@ extern int crnl_mapping; //0 - no mappin
- extern int script; /* script active flag */
- extern char scr_name[MAX_SCRIPT_NAME]; /* default name of the script */
- extern char device[MAX_DEVICE_NAME]; /* serial device name */
--extern int log; /* log active flag */
-+extern int log_active; /* log active flag */
- extern FILE* flog; /* log file */
-
- static int help_state = 0;
-@@ -85,7 +85,7 @@ static void help_escape(void) {
-
- write(STDOUT_FILENO, str1, strlen(str1));
-
-- if (log == 0)
-+ if (log_active == 0)
- write(STDOUT_FILENO, " l - log on \n", 26);
- else
- write(STDOUT_FILENO, " l - log off \n", 26);
-@@ -156,11 +156,11 @@ static void help_send_escape(int fd, cha
- case 'q': /* quit help */
- break;
- case 'l': /* log on/off */
-- log = (log == 0)? 1: 0;
-- if (log) { /* open log file */
-+ log_active = (log_active == 0)? 1: 0;
-+ if (log_active) { /* open log file */
- if ((flog = fopen("microcom.log", "a")) == (FILE *)0) {
- write(STDOUT_FILENO, "Cannot open microcom.log \n", 26);
-- log = 0;
-+ log_active = 0;
- }
- }
- else { /* cloase log file */
-diff -rdup microcom-1.02.speed/microcom.c microcom-1.02/microcom.c
---- microcom-1.02.speed/microcom.c 2000-08-27 17:22:47.000000000 +0200
-+++ microcom-1.02/microcom.c 2007-01-19 19:48:37.000000000 +0100
-@@ -25,7 +25,7 @@ int crnl_mapping; //0 - no mapping, 1 ma
- int script = 0; /* script active flag */
- char scr_name[MAX_SCRIPT_NAME] = "script.scr"; /* default name of the script */
- char device[MAX_DEVICE_NAME]; /* serial device name */
--int log = 0; /* log active flag */
-+int log_active = 0; /* log active flag */
- FILE* flog; /* log file */
- int pf = 0; /* port file descriptor */
- struct termios pots; /* old port termios settings to restore */
-@@ -106,7 +106,7 @@ void main_usage(int exitcode, char *str,
- /* restore original terminal settings on exit */
- void cleanup_termios(int signal) {
- /* cloase the log file first */
-- if (log) {
-+ if (log_active) {
- fflush(flog);
- fclose(flog);
- }
-diff -rdup microcom-1.02.speed/mux.c microcom-1.02/mux.c
---- microcom-1.02.speed/mux.c 2000-07-30 06:15:47.000000000 +0200
-+++ microcom-1.02/mux.c 2007-01-19 19:48:48.000000000 +0100
-@@ -24,7 +24,7 @@
-
- extern int script;
- extern char scr_name[];
--extern int log;
-+extern int log_active;
- extern FILE* flog;
-
- void mux_clear_sflag(void) {
-@@ -71,7 +71,7 @@ void mux_loop(int pf) {
- i = read(pf, buf, BUFSIZE);
- if (i > 0) {
- write(STDOUT_FILENO, buf, i);
-- if (log)
-+ if (log_active)
- fwrite(buf, 1, i, flog);
- if (script) {
- i = script_process(S_DCE, buf, i);
diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk
index f691723..729230e 100644
--- a/package/microcom/microcom.mk
+++ b/package/microcom/microcom.mk
@@ -2,70 +2,32 @@
#
# microcom terminal emulator
#
-# Maintainer: Tim Riker <Tim@Rikers.org>
-#
#############################################################
-# 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
-
-# TARGETS
-# http://microcom.port5.com/m102.tar.gz
-MICROCOM_VERSION:=1.02
-MICROCOM_SITE:=http://buildroot.net/downloads/sources/
-MICROCOM_SOURCE:=m102.tar.gz
-MICROCOM_DIR:=$(BUILD_DIR)/microcom-$(MICROCOM_VERSION)
-
-$(DL_DIR)/$(MICROCOM_SOURCE):
- $(call DOWNLOAD,$(MICROCOM_SITE),$(MICROCOM_SOURCE))
-
-microcom-source: $(DL_DIR)/$(MICROCOM_SOURCE)
+MICROCOM_VERSION = 1.02
+MICROCOM_SOURCE = m102.tar.gz
+MICROCOM_SITE = http://sources.buildroot.net
-$(MICROCOM_DIR)/.unpacked: $(DL_DIR)/$(MICROCOM_SOURCE)
- mkdir -p $(MICROCOM_DIR)
- $(ZCAT) $(DL_DIR)/$(MICROCOM_SOURCE) | tar -C $(MICROCOM_DIR) $(TAR_OPTIONS) -
+define MICROCOM_CONFIGURE_CMDS
+ $(ZCAT) $(DL_DIR)/$(MICROCOM_SOURCE) | tar -C $(@D) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(MICROCOM_DIR) package/microcom/ \*.patch
- touch $@
+ $(SED) 's~gcc~$$(CC)~' -e 's~-O~$$(CFLAGS)~' $(@D)/Makefile
+endef
-$(MICROCOM_DIR)/.configured: $(MICROCOM_DIR)/.unpacked
- $(SED) 's~gcc~$$(CC)~' -e 's~-O~$$(CFLAGS)~' $(MICROCOM_DIR)/Makefile
- touch $@
+define MICROCOM_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
-$(MICROCOM_DIR)/microcom: $(MICROCOM_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MICROCOM_DIR)
- $(STRIPCMD) $(STRIP_STRIP_ALL) $@
+define MICROCOM_INSTALL_TARGET_CMDS
+ install -D -m 755 $(@D)/microcom $(TARGET_DIR)/usr/bin/microcom
+endef
-$(TARGET_DIR)/usr/bin/microcom: $(MICROCOM_DIR)/microcom
- install -c $(MICROCOM_DIR)/microcom $(TARGET_DIR)/usr/bin/microcom
+define MICROCOM_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/microcom
+endef
-microcom-clean:
- rm -f $(MICROCOM_DIR)/*.o $(MICROCOM_DIR)/microcom \
- $(TARGET_DIR)/usr/bin/microcom
+define MICROCOM_CLEAN_CMDS
+ rm -f $(@D)/*.o
+endef
-microcom-dirclean:
- rm -rf $(MICROCOM_DIR)
-
-microcom: $(TARGET_DIR)/usr/bin/microcom
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MICROCOM),y)
-TARGETS+=microcom
-endif
+$(eval $(call GENTARGETS,package,microcom))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 04/10] memtester: convert to gentargets and bump to 4.2.0
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
Also, memtester requires largefile support
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/memtester/Config.in | 4 +++
package/memtester/memtester.mk | 55 ++++++++++++++--------------------------
2 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/package/memtester/Config.in b/package/memtester/Config.in
index 7a504dc..82769f5 100644
--- a/package/memtester/Config.in
+++ b/package/memtester/Config.in
@@ -1,6 +1,10 @@
config BR2_PACKAGE_MEMTESTER
bool "memtester"
+ depends on BR2_LARGEFILE
help
A userspace utility for testing the memory subsystem for faults.
http://pyropus.ca/software/memtester/
+
+comment "memtester requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index ed8470b..6e72152 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -3,45 +3,28 @@
# memtester
#
#############################################################
-MEMTESTER_VERSION:=4.0.6
-MEMTESTER_SOURCE:=memtester-$(MEMTESTER_VERSION).tar.gz
-MEMTESTER_SITE:=http://pyropus.ca/software/memtester/old-versions/
-MEMTESTER_DIR:=$(BUILD_DIR)/memtester-$(MEMTESTER_VERSION)
-MEMTESTER_BINARY:=memtester
-MEMTESTER_TARGET_BINARY:=usr/bin/memtester
+MEMTESTER_VERSION = 4.2.0
+MEMTESTER_SOURCE = memtester-$(MEMTESTER_VERSION).tar.gz
+MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions/
-$(DL_DIR)/$(MEMTESTER_SOURCE):
- $(call DOWNLOAD,$(MEMTESTER_SITE),$(MEMTESTER_SOURCE))
+MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr
-memtester-source: $(DL_DIR)/$(MEMTESTER_SOURCE)
+define MEMTESTER_BUILD_CMDS
+ $(SED) "s,cc,$(TARGET_CC)," $(@D)/conf-*
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
-$(MEMTESTER_DIR)/.unpacked: $(DL_DIR)/$(MEMTESTER_SOURCE)
- $(ZCAT) $(DL_DIR)/$(MEMTESTER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- #toolchain/patch-kernel.sh $(MEMTESTER_DIR) package/memtester/ memtester\*.patch
- $(SED) "s,cc,$(TARGET_CC)," $(MEMTESTER_DIR)/conf-*
- touch $(MEMTESTER_DIR)/.unpacked
+define MEMTESTER_INSTALL_TARGET_CMDS
+ $(MAKE) $(MEMTESTER_TARGET_INSTALL_OPTS) -C $(@D) install
+endef
-$(MEMTESTER_DIR)/$(MEMTESTER_BINARY): $(MEMTESTER_DIR)/.unpacked
- $(MAKE) -C $(MEMTESTER_DIR)
- $(STRIPCMD) $(MEMTESTER_DIR)/$(MEMTESTER_BINARY)
+define MEMTESTER_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/memtester
+endef
-$(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY): $(MEMTESTER_DIR)/$(MEMTESTER_BINARY)
- $(INSTALL) -m 0755 -D $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY)
+define MEMTESTER_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
+endef
-memtester: $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY)
-
-memtester-clean:
- rm -f $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY)
- -$(MAKE) -C $(MEMTESTER_DIR) clean
-
-memtester-dirclean:
- rm -rf $(MEMTESTER_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MEMTESTER),y)
-TARGETS+=memtester
-endif
+$(eval $(call GENTARGETS,package,memtester))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 03/10] lvm2: convert to autotargets and bump to 2.02.74
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/lvm2/lvm2.mk | 153 +++++++++++++++++---------------------------------
1 files changed, 51 insertions(+), 102 deletions(-)
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 2bd6b8b..b359b97 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -3,115 +3,64 @@
# lvm2
#
#############################################################
-# Copyright (C) 2005 by Richard Downer <rdowner@gmail.com>
-# Derived from work
-# Copyright (C) 2001-2005 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
-
-LVM2_BASEVER=2.02
-LVM2_DMVER=1.02
-LVM2_PATCH=50
-LVM2_VERSION=$(LVM2_BASEVER).$(LVM2_PATCH)
-LVM2_SOURCE:=LVM2.$(LVM2_VERSION).tgz
-LVM2_SITE:=ftp://sources.redhat.com/pub/lvm2
-LVM2_CAT:=$(ZCAT)
-LVM2_DIR:=$(BUILD_DIR)/LVM2.$(LVM2_VERSION)
-LVM2_SBIN:=lvchange lvcreate lvdisplay lvextend lvm lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove lvrename lvresize lvs lvscan pvchange pvcreate pvdisplay pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan vgsplit
-LVM2_DMSETUP_SBIN:=dmsetup
-LVM2_LIB:=libdevmapper.so.$(LVM2_DMVER)
-LVM2_TARGET_SBINS=$(foreach lvm2sbin, $(LVM2_SBIN), $(TARGET_DIR)/sbin/$(lvm2sbin))
-LVM2_TARGET_DMSETUP_SBINS=$(foreach lvm2sbin, $(LVM2_DMSETUP_SBIN), $(TARGET_DIR)/sbin/$(lvm2sbin))
-LVM2_TARGET_LIBS=$(foreach lvm2lib, $(LVM2_LIB), $(TARGET_DIR)/lib/$(lvm2lib))
-
-$(DL_DIR)/$(LVM2_SOURCE):
- $(call DOWNLOAD,$(LVM2_SITE),$(LVM2_SOURCE))
-
-lvm2-source: $(DL_DIR)/$(LVM2_SOURCE)
-
+LVM2_VERSION = 2.02.74
+LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
+LVM2_SITE = ftp://sources.redhat.com/pub/lvm2
+LVM2_INSTALL_STAGING = YES
+
+LVM2_BINS = dmsetup fsadm lvchange lvconvert lvcreate lvdisplay lvextend lvm \
+ lvmchange lvmconf lvmdiskscan lvmdump lvmsadc lvmsar lvreduce lvremove \
+ lvrename lvresize lvs lvscan pvchange pvck pvcreate pvdisplay pvmove \
+ pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore vgchange vgck \
+ vgconvert vgcreate vgdisplay vgexport vgextend vgimport vgimportclone \
+ vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan vgsplit
ifeq ($(BR2_PACKAGE_READLINE),y)
-LVM2_DEPENDENCIES+=readline
+LVM2_DEPENDENCIES += readline
else
# v2.02.44: disable readline usage, or binaries are linked against provider
# of "tgetent" (=> ncurses) even if it's not used..
-LVM2_CONF_OPT+=--disable-readline
+LVM2_CONF_OPT += --disable-readline
endif
-
-$(LVM2_DIR)/.unpacked: $(DL_DIR)/$(LVM2_SOURCE)
- $(LVM2_CAT) $(DL_DIR)/$(LVM2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(LVM2_DIR)/.unpacked
-
-$(LVM2_DIR)/.configured: $(LVM2_DIR)/.unpacked
- (cd $(LVM2_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- $(DISABLE_NLS) \
- $(DISABLE_LARGEFILE) \
- --with-user=$(shell id -un) --with-group=$(shell id -gn) \
- $(LVM2_CONF_OPT) \
- )
- touch $(LVM2_DIR)/.configured
-
-
-$(LVM2_DIR)/.built: $(LVM2_DIR)/.configured
- $(MAKE1) -C $(LVM2_DIR) DESTDIR=$(STAGING_DIR)
- $(MAKE1) -C $(LVM2_DIR) DESTDIR=$(STAGING_DIR) install
- # Fixup write permissions so that the files can be overwritten
- # several times in the $(TARGET_DIR)
- chmod 755 $(STAGING_DIR)/sbin/lvm
- chmod 755 $(STAGING_DIR)/sbin/dmsetup
- chmod 644 $(STAGING_DIR)/lib/$(LVM2_LIB)
- touch $(LVM2_DIR)/.built
-
-
-$(LVM2_TARGET_SBINS) $(LVM2_TARGET_DMSETUP_SBINS): $(LVM2_DIR)/.built
- cp -a $(STAGING_DIR)/sbin/$(notdir $@) $@
- touch $@
-
-$(LVM2_TARGET_LIBS): $(LVM2_DIR)/.built
- cp -a $(STAGING_DIR)/lib/$(notdir $@) $@
- touch $@
-
-
ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y)
-lvm2: $(LVM2_TARGET_DMSETUP_SBINS) $(LVM2_TARGET_LIBS)
-else
-lvm2: $(LVM2_TARGET_SBINS) $(LVM2_TARGET_DMSETUP_SBINS) $(LVM2_TARGET_LIBS)
+LVM2_MAKE_OPT = device-mapper
+LVM2_INSTALL_STAGING_OPT = DESTDIR=$$(STAGING_DIR) device-mapper_install
+LVM2_INSTALL_TARGET_OPT = DESTDIR=$$(STAGING_DIR) device-mapper_install
endif
-
-lvm2-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(LVM2_DIR) uninstall
- -$(MAKE) -C $(LVM2_DIR) clean
-
-lvm2-dirclean:
- rm -rf $(LVM2_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LVM2),y)
-TARGETS+=lvm2
-endif
+define LVM2_STAGING_FILE_PERMS_FIXUP
+ chmod 755 $(STAGING_DIR)/usr/sbin/lvm
+ chmod 755 $(STAGING_DIR)/usr/sbin/fsadm
+ chmod 755 $(STAGING_DIR)/usr/sbin/dmsetup
+ chmod 755 $(STAGING_DIR)/usr/sbin/lvmconf
+ chmod 755 $(STAGING_DIR)/usr/sbin/lvmdump
+ chmod 755 $(STAGING_DIR)/usr/sbin/vgimportclone
+ chmod 644 $(STAGING_DIR)/usr/lib/libdevmapper.so
+endef
+
+LVM2_POST_INSTALL_STAGING_HOOKS += LVM2_STAGING_FILE_PERMS_FIXUP
+
+define LVM2_TARGET_FILE_PERMS_FIXUP
+ chmod 755 $(TARGET_DIR)/usr/sbin/lvm
+ chmod 755 $(TARGET_DIR)/usr/sbin/fsadm
+ chmod 755 $(TARGET_DIR)/usr/sbin/dmsetup
+ chmod 755 $(TARGET_DIR)/usr/sbin/lvmconf
+ chmod 755 $(TARGET_DIR)/usr/sbin/lvmdump
+ chmod 755 $(TARGET_DIR)/usr/sbin/vgimportclone
+ chmod 644 $(TARGET_DIR)/usr/lib/libdevmapper.so
+endef
+
+LVM2_POST_INSTALL_TARGET_HOOKS += LVM2_TARGET_FILE_PERMS_FIXUP
+
+define LVM2_UNINSTALL_STAGING_CMDS
+ rm -f $(addprefix $(STAGING_DIR)/usr/sbin/,$(LVM2_BINS))
+ rm -f $(addprefix $(STAGING_DIR)/usr/lib/,libdevmapper.so*)
+endef
+
+define LVM2_UNINSTALL_TARGET_CMDS
+ rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(LVM2_BINS))
+ rm -f $(addprefix $(TARGET_DIR)/usr/lib/,libdevmapper.so*)
+endef
+
+$(eval $(call AUTOTARGETS,package,lvm2))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 02/10] lsof: convert to gentargets and bump to 4.84
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-1-git-send-email-Martin.Banky@gmail.com>
An explanation is required for this package. The source for this package is an
archive inside an archive. The gentargets makefile only extracts the first
archive, but not the second. This causes the patch routine to fail. I hide the
patches from the gentargets patch routine, and then extract and patch the
second archive during the configure routine. Also, I've changed the patches to
no longer point to the sub-directory, which is version dependent.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/lsof/_lsof-4.84-makefile.patch | 14 +++
package/lsof/_lsof-4.84-noportmap.patch | 18 ++++
.../lsof/_lsof-4.84-remove-susvlegacy-funcs.patch | 12 +++
package/lsof/lsof-makefile.patch | 14 ---
package/lsof/lsof-noportmap.patch | 18 ----
package/lsof/lsof-remove-susvlegacy-funcs.patch | 12 ---
package/lsof/lsof-uclibc.patch | 12 ---
package/lsof/lsof.mk | 86 ++++++++-----------
8 files changed, 80 insertions(+), 106 deletions(-)
create mode 100644 package/lsof/_lsof-4.84-makefile.patch
create mode 100644 package/lsof/_lsof-4.84-noportmap.patch
create mode 100644 package/lsof/_lsof-4.84-remove-susvlegacy-funcs.patch
delete mode 100644 package/lsof/lsof-makefile.patch
delete mode 100644 package/lsof/lsof-noportmap.patch
delete mode 100644 package/lsof/lsof-remove-susvlegacy-funcs.patch
delete mode 100644 package/lsof/lsof-uclibc.patch
diff --git a/package/lsof/_lsof-4.84-makefile.patch b/package/lsof/_lsof-4.84-makefile.patch
new file mode 100644
index 0000000..65b1b2e
--- /dev/null
+++ b/package/lsof/_lsof-4.84-makefile.patch
@@ -0,0 +1,14 @@
+diff -ru lsof_4.81.orig/lsof_4.81_src/lib/Makefile.skel lsof_4.81/lsof_4.81_src/lib/Makefile.skel
+--- a/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100
++++ b/lib/Makefile.skel 2006-11-29 13:51:44.000000000 +0100
+@@ -21,8 +21,8 @@
+ all: ${LIB}
+
+ ${LIB}: ${OBJ}
+- ${AR}
+- ${RANLIB}
++ ${AR} cr ${LIB} ${OBJ}
++ ${RANLIB} ${LIB}
+
+ clean: FRC
+ rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core
diff --git a/package/lsof/_lsof-4.84-noportmap.patch b/package/lsof/_lsof-4.84-noportmap.patch
new file mode 100644
index 0000000..984e0d8
--- /dev/null
+++ b/package/lsof/_lsof-4.84-noportmap.patch
@@ -0,0 +1,18 @@
+--- a/print.c 2006-08-23 13:37:43.000000000 -0600
++++ b/print.c 2006-08-23 13:38:29.000000000 -0600
+@@ -148,6 +148,7 @@
+ static void
+ fill_portmap()
+ {
++#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_RPC__)
+ char buf[128], *cp, *nm;
+ CLIENT *c;
+ int h, port, pr;
+@@ -266,6 +267,7 @@
+ Pth[pr][h] = pt;
+ }
+ clnt_destroy(c);
++#endif
+ }
+
+
diff --git a/package/lsof/_lsof-4.84-remove-susvlegacy-funcs.patch b/package/lsof/_lsof-4.84-remove-susvlegacy-funcs.patch
new file mode 100644
index 0000000..fca66ae
--- /dev/null
+++ b/package/lsof/_lsof-4.84-remove-susvlegacy-funcs.patch
@@ -0,0 +1,12 @@
+diff -rdup lsof_4.81.orig/lsof_4.81_src/dialects/linux/machine.h lsof_4.81/lsof_4.81_src/dialects/linux/machine.h
+--- a/dialects/linux/machine.h 2007-04-24 18:20:58.000000000 +0200
++++ b/dialects/linux/machine.h 2007-05-15 12:17:03.000000000 +0200
+@@ -616,6 +616,6 @@
+ * zeromem is a macro that uses bzero or memset.
+ */
+
+-#define zeromem(a, l) bzero(a, l)
++#define zeromem(a, l) memset(a, 0, l)
+
+ #endif /* !defined(LSOF_MACHINE_H) */
+
diff --git a/package/lsof/lsof-makefile.patch b/package/lsof/lsof-makefile.patch
deleted file mode 100644
index 2d4e9d4..0000000
--- a/package/lsof/lsof-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru lsof_4.81.orig/lsof_4.81_src/lib/Makefile.skel lsof_4.81/lsof_4.81_src/lib/Makefile.skel
---- lsof_4.81.orig/lsof_4.81_src/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100
-+++ lsof_4.81/lsof_4.81_src/lib/Makefile.skel 2006-11-29 13:51:44.000000000 +0100
-@@ -21,8 +21,8 @@
- all: ${LIB}
-
- ${LIB}: ${OBJ}
-- ${AR}
-- ${RANLIB}
-+ ${AR} cr ${LIB} ${OBJ}
-+ ${RANLIB} ${LIB}
-
- clean: FRC
- rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core
diff --git a/package/lsof/lsof-noportmap.patch b/package/lsof/lsof-noportmap.patch
deleted file mode 100644
index 4a37db4..0000000
--- a/package/lsof/lsof-noportmap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- lsof_4.81/lsof_4.81_src/print.orig.c 2006-08-23 13:37:43.000000000 -0600
-+++ lsof_4.81/lsof_4.81_src/print.c 2006-08-23 13:38:29.000000000 -0600
-@@ -148,6 +148,7 @@
- static void
- fill_portmap()
- {
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_RPC__)
- char buf[128], *cp, *nm;
- CLIENT *c;
- int h, port, pr;
-@@ -266,6 +267,7 @@
- Pth[pr][h] = pt;
- }
- clnt_destroy(c);
-+#endif
- }
-
-
diff --git a/package/lsof/lsof-remove-susvlegacy-funcs.patch b/package/lsof/lsof-remove-susvlegacy-funcs.patch
deleted file mode 100644
index d1d9371..0000000
--- a/package/lsof/lsof-remove-susvlegacy-funcs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rdup lsof_4.81.orig/lsof_4.81_src/dialects/linux/machine.h lsof_4.81/lsof_4.81_src/dialects/linux/machine.h
---- lsof_4.81.orig/lsof_4.81_src/dialects/linux/machine.h 2007-04-24 18:20:58.000000000 +0200
-+++ lsof_4.81/lsof_4.81_src/dialects/linux/machine.h 2007-05-15 12:17:03.000000000 +0200
-@@ -616,6 +616,6 @@
- * zeromem is a macro that uses bzero or memset.
- */
-
--#define zeromem(a, l) bzero(a, l)
-+#define zeromem(a, l) memset(a, 0, l)
-
- #endif /* !defined(LSOF_MACHINE_H) */
-
diff --git a/package/lsof/lsof-uclibc.patch b/package/lsof/lsof-uclibc.patch
deleted file mode 100644
index 797a0ce..0000000
--- a/package/lsof/lsof-uclibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru lsof_4.81.orig/lsof_4.81_src/dialects/linux/dlsof.h lsof_4.81/lsof_4.81_src/dialects/linux/dlsof.h
---- lsof_4.81.orig/lsof_4.81_src/dialects/linux/dlsof.h 2006-03-28 00:57:14.000000000 +0200
-+++ lsof_4.81/lsof_4.81_src/dialects/linux/dlsof.h 2006-11-29 14:03:07.000000000 +0100
-@@ -49,7 +49,7 @@
- #include <unistd.h>
- #include <netinet/in.h>
-
--# if defined(GLIBCV)
-+# if defined(GLIBCV) || defined __UCLIBC__
- #include <netinet/tcp.h>
- # else /* !defined(GLIBCV) */
- #include <linux/tcp.h>
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 8deff15..665ea3d 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -3,68 +3,54 @@
# lsof
#
#############################################################
-LSOF_VERSION:=4.81
-LSOF_SOURCE:=lsof_$(LSOF_VERSION).tar.bz2
-LSOF_SITE:=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
-LSOF_CAT:=$(BZCAT)
-LSOF_DIR:=$(BUILD_DIR)/lsof_$(LSOF_VERSION)
-LSOF_BINARY:=lsof
-LSOF_TARGET_BINARY:=bin/lsof
-LSOF_INCLUDE:=$(STAGING_DIR)/usr/include
+LSOF_VERSION = 4.84
+LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
+LSOF_SITE = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
+LSOF_INCLUDE = $(STAGING_DIR)/usr/include
-BR2_LSOF_CFLAGS:=
+BR2_LSOF_CFLAGS =
ifeq ($(BR2_LARGEFILE),)
-BR2_LSOF_CFLAGS+=-U_FILE_OFFSET_BITS
+BR2_LSOF_CFLAGS += -U_FILE_OFFSET_BITS
endif
ifeq ($(BR2_INET_IPV6),)
-BR2_LSOF_CFLAGS+=-UHASIPv6
+BR2_LSOF_CFLAGS += -UHASIPv6
endif
-$(DL_DIR)/$(LSOF_SOURCE):
- $(call DOWNLOAD,$(LSOF_SITE),$(LSOF_SOURCE))
-
-lsof-source: $(DL_DIR)/$(LSOF_SOURCE)
-
-lsof-unpacked: $(LSOF_DIR)/.unpacked
-
-$(LSOF_DIR)/.unpacked: $(DL_DIR)/$(LSOF_SOURCE)
- $(LSOF_CAT) $(DL_DIR)/$(LSOF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- (cd $(LSOF_DIR);tar xf lsof_$(LSOF_VERSION)_src.tar;rm -f lsof_$(LSOF_VERSION)_src.tar)
- toolchain/patch-kernel.sh $(LSOF_DIR) package/lsof/ \*.patch
- touch $(LSOF_DIR)/.unpacked
-
-$(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked
- (cd $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src; echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" LSOF_INCLUDE="$(LSOF_INCLUDE)" ./Configure linux)
- touch $(LSOF_DIR)/.configured
-
-$(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured
ifeq ($(BR2_USE_WCHAR),)
- $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
- $(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
+define LSOF_CONFIGURE_WCHAR_FIXUPS
+ $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(@D)/lsof_$(LSOF_VERSION)_src/machine.h
+ $(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' $(@D)/lsof_$(LSOF_VERSION)_src/machine.h
+endef
endif
+
ifeq ($(BR2_ENABLE_LOCALE),)
- $(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
+define LSOF_CONFIGURE_LOCALE_FIXUPS
+ $(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(@D)/lsof_$(LSOF_VERSION)_src/machine.h
+endef
endif
- $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src
-$(TARGET_DIR)/$(LSOF_TARGET_BINARY): $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY)
- cp $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY) $@
- $(STRIPCMD) $@
+define LSOF_CONFIGURE_CMDS
+ (cd $(@D);tar xf lsof_$(LSOF_VERSION)_src.tar;rm -f lsof_$(LSOF_VERSION)_src.tar)
+ toolchain/patch-kernel.sh $(@D)/lsof_$(LSOF_VERSION)_src package/lsof \*.patch
+ (cd $(@D)/lsof_$(LSOF_VERSION)_src; echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" LSOF_INCLUDE="$(LSOF_INCLUDE)" ./Configure linux)
+ $(LSOF_CONFIGURE_WCHAR_FIXUPS)
+ $(LSOF_CONFIGURE_LOCALE_FIXUPS)
+endef
-lsof: $(TARGET_DIR)/$(LSOF_TARGET_BINARY)
+define LSOF_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(@D)/lsof_$(LSOF_VERSION)_src
+endef
-lsof-clean:
- -rm -f $(TARGET_DIR)/$(LSOF_TARGET_BINARY)
- -$(MAKE) -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src clean
+define LSOF_INSTALL_TARGET_CMDS
+ install -D -m 755 $(@D)/lsof_$(LSOF_VERSION)_src/lsof $(TARGET_DIR)/bin/lsof
+endef
-lsof-dirclean:
- rm -rf $(LSOF_DIR)
+define LSOF_UNINSTALL_TARGET_CMDS
+ -rm -f $(TARGET_DIR)/bin/lsof
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LSOF),y)
-TARGETS+=lsof
-endif
+define LSOF_CLEAN_CMDS
+ -$(MAKE) -C $(@D)/lsof_$(LSOF_VERSION)_src clean
+endef
+
+$(eval $(call GENTARGETS,package,lsof))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 01/10] input-tools: convert to gentargets
From: Martin Banky @ 2010-10-05 8:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
.../input-tools/input-tools-20051019-rint.patch | 18 ++++
package/input-tools/input-tools.mk | 97 ++++++++-----------
package/input-tools/joystick-20051019-rint.patch | 18 ----
3 files changed, 59 insertions(+), 74 deletions(-)
create mode 100644 package/input-tools/input-tools-20051019-rint.patch
delete mode 100644 package/input-tools/joystick-20051019-rint.patch
diff --git a/package/input-tools/input-tools-20051019-rint.patch b/package/input-tools/input-tools-20051019-rint.patch
new file mode 100644
index 0000000..b2aa13f
--- /dev/null
+++ b/package/input-tools/input-tools-20051019-rint.patch
@@ -0,0 +1,18 @@
+diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c
+--- joystick-20051019.orig/utils/jscal.c 2004-10-19 09:51:52.000000000 +0200
++++ joystick-20051019/utils/jscal.c 2009-01-18 10:48:50.000000000 +0100
+@@ -141,10 +141,10 @@
+ c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]);
+ d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]);
+
+- results[0] = rint(a);
+- results[1] = rint(b);
+- results[2] = rint(c*16384.0);
+- results[3] = rint(d*16384.0);
++ results[0] = (int) (a + 0.5);
++ results[1] = (int) (b + 0.5);
++ results[2] = (int) (c*16384.0 + 0.5);
++ results[3] = (int) (d*16384.0 + 0.5);
+
+ return 1;
+ }
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index 9f5eb19..6553e37 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -3,64 +3,49 @@
# input-tools
#
#############################################################
+INPUT_TOOLS_VERSION = 20051019
+INPUT_TOOLS_SOURCE = joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
+INPUT_TOOLS_PATCH = joystick_$(INPUT_TOOLS_VERSION)-5.diff.gz
+INPUT_TOOLS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/j/joystick/
-INPUT_TOOLS_VERSION:=20051019
-INPUT_TOOLS_SOURCE:=joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
-INPUT_TOOLS_PATCH:=joystick_$(INPUT_TOOLS_VERSION)-2.diff.gz
-INPUT_TOOLS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/j/joystick/
-INPUT_TOOLS_DIR:=$(BUILD_DIR)/joystick-$(INPUT_TOOLS_VERSION).orig
-INPUT_TOOLS_CAT:=$(ZCAT)
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_EVTEST) += evtest
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
-INPUT_TOOLS_TARGETS-y:=
-
-INPUT_TOOLS_TARGETS-$(BR2_PACKAGE_INPUT_TOOLS_EVTEST) += evtest
-INPUT_TOOLS_TARGETS-$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
-INPUT_TOOLS_TARGETS-$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal
-INPUT_TOOLS_TARGETS-$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
-
-INPUT_TOOLS_TARGETS := $(addprefix $(TARGET_DIR)/usr/bin/, $(INPUT_TOOLS_TARGETS-y))
-INPUT_TOOLS_SOURCES := $(addprefix $(INPUT_TOOLS_DIR)/utils/, \
- $(addsuffix .c, $(INPUT_TOOLS_TARGETS-y)))
-
-$(DL_DIR)/$(INPUT_TOOLS_SOURCE):
- $(call DOWNLOAD,$(INPUT_TOOLS_SITE),$(@F))
-
-$(DL_DIR)/$(INPUT_TOOLS_PATCH):
- $(call DOWNLOAD,$(INPUT_TOOLS_SITE),$(@F))
-
-$(INPUT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(INPUT_TOOLS_SOURCE) $(DL_DIR)/$(INPUT_TOOLS_PATCH)
- $(INPUT_TOOLS_CAT) $(DL_DIR)/$(INPUT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(INPUT_TOOLS_PATCH),)
- (cd $(INPUT_TOOLS_DIR) && $(INPUT_TOOLS_CAT) $(DL_DIR)/$(INPUT_TOOLS_PATCH) | patch -p1)
+define INPUT_TOOLS_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ (cd $(@D)/debian/patches && for i in *; \
+ do $(SED) 's,^\+\+\+ .*joystick-$(INPUT_TOOLS_VERSION)/,+++ joystick-$(INPUT_TOOLS_VERSION)/,' $$i; \
+ done; \
+ ); \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+ fi
+endef
endif
- toolchain/patch-kernel.sh $(INPUT_TOOLS_DIR) package/input-tools/ \*.patch
- touch $@
-
-$(INPUT_TOOLS_SOURCES): $(INPUT_TOOLS_DIR)/.unpacked
-
-$(INPUT_TOOLS_DIR)/utils/%: $(INPUT_TOOLS_DIR)/utils/%.c
- $(TARGET_CC) $(TARGET_CFLAGS) -o $@ $^
-
-$(INPUT_TOOLS_TARGETS): $(TARGET_DIR)/usr/bin/%: $(INPUT_TOOLS_DIR)/utils/%
- cp -dpf $^ $@
- $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-input-tools: $(INPUT_TOOLS_TARGETS)
-input-tools-source: $(DL_DIR)/$(INPUT_TOOLS_SOURCE) $(DL_DIR)/$(INPUT_TOOLS_PATCH)
-
-input-tools-unpacked: $(INPUT_TOOLS_DIR)/.unpacked
-
-input-tools-clean:
- rm -f $(INPUT_TOOLS_TARGETS)
-
-input-tools-dirclean:
- rm -rf $(INPUT_TOOLS_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_INPUT_TOOLS),y)
-TARGETS+=input-tools
-endif
+define INPUT_TOOLS_BUILD_CMDS
+ $(INPUT_TOOLS_DEBIAN_PATCHES)
+ (cd $(@D)/utils; \
+ $(TARGET_CC) $(TARGET_CFLAGS) -o evtest evtest.c; \
+ $(TARGET_CC) $(TARGET_CFLAGS) -o inputattach inputattach.c; \
+ $(TARGET_CC) $(TARGET_CFLAGS) -o jscal jscal.c; \
+ $(TARGET_CC) $(TARGET_CFLAGS) -o jstest jstest.c; \
+ )
+endef
+
+define INPUT_TOOLS_INSTALL_TARGET_CMDS
+ test -z "$(INPUT_TOOLS_TARGETS_y)" || \
+ install -m 755 $(addprefix $(@D)/utils/,$(INPUT_TOOLS_TARGETS_y)) $(TARGET_DIR)/usr/bin/
+endef
+
+define INPUT_TOOLS_UNINSTALL_TARGET_CMDS
+ rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(INPUT_TOOLS_TARGETS_y))
+endef
+
+define INPUT_TOOLS_CLEAN_CMDS
+ rm -f $(addprefix $(@D)/utils/,$(INPUT_TOOLS_TARGETS_y))
+endef
+
+$(eval $(call GENTARGETS,package,input-tools))
diff --git a/package/input-tools/joystick-20051019-rint.patch b/package/input-tools/joystick-20051019-rint.patch
deleted file mode 100644
index b2aa13f..0000000
--- a/package/input-tools/joystick-20051019-rint.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c
---- joystick-20051019.orig/utils/jscal.c 2004-10-19 09:51:52.000000000 +0200
-+++ joystick-20051019/utils/jscal.c 2009-01-18 10:48:50.000000000 +0100
-@@ -141,10 +141,10 @@
- c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]);
- d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]);
-
-- results[0] = rint(a);
-- results[1] = rint(b);
-- results[2] = rint(c*16384.0);
-- results[3] = rint(d*16384.0);
-+ results[0] = (int) (a + 0.5);
-+ results[1] = (int) (b + 0.5);
-+ results[2] = (int) (c*16384.0 + 0.5);
-+ results[3] = (int) (d*16384.0 + 0.5);
-
- return 1;
- }
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] netkittelnet: mark as deprecated
From: Martin Banky @ 2010-10-05 8:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266055-23083-1-git-send-email-Martin.Banky@gmail.com>
10+ years old, and is no longer being maintained
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/netkittelnet/Config.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/netkittelnet/Config.in b/package/netkittelnet/Config.in
index 058d210..027db32 100644
--- a/package/netkittelnet/Config.in
+++ b/package/netkittelnet/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_NETKITTELNET
bool "netkittelnet"
depends on BR2_INET_RPC
+ depends on BR2_DEPRECATED
select BR2_PACKAGE_NETKITBASE
help
Standard Linux telnet client and server.
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] netkitbase: mark as deprecated
From: Martin Banky @ 2010-10-05 8:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266055-23083-1-git-send-email-Martin.Banky@gmail.com>
10+ years old, and is no longer being maintained
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/netkitbase/Config.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/netkitbase/Config.in b/package/netkitbase/Config.in
index 725e500..e11309e 100644
--- a/package/netkitbase/Config.in
+++ b/package/netkitbase/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_NETKITBASE
bool "netkitbase"
depends on BR2_INET_RPC
+ depends on BR2_DEPRECATED
help
Old-style inetd.
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 0/2] Deprecated netkit pkgs
From: Martin Banky @ 2010-10-05 8:07 UTC (permalink / raw)
To: buildroot
[PATCH 1/2] netkitbase: mark as deprecated
[PATCH 2/2] netkittelnet: mark as deprecated
^ permalink raw reply
* [Buildroot] [PATCH 2/2] imagemagick: convert to autotargets and bump to 6.6.4
From: Peter Korsgaard @ 2010-10-05 7:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286052682-22218-3-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> program-transform-name='s,,,' is needed, otherwise configure defines it as
Martin> $(platform)-$(cpu)-. During install, all executables are prepended with this
Martin> variable.
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Martin> -IMAGEMAGICK_MAJOR:=6.4.8
Martin> -IMAGEMAGICK_VERSION:=$(IMAGEMAGICK_MAJOR)-4
Martin> -IMAGEMAGICK_SOURCE:=ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
Martin> -IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
Martin> -IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
Martin> -IMAGEMAGICK_CAT:=$(BZCAT)
Martin> -IMAGEMAGICK_LIB:=$(TARGET_DIR)/usr/lib/libMagickCore.so
Martin> +IMAGEMAGICK_MAJOR = 6.6.4
Martin> +IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-8
Martin> +IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
Martin> +IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
Martin> +IMAGEMAGICK_INSTALL_STAGING = YES
We neee IMAGEMAGICK_LIBTOOL_PATCH = NO
Martin> +define ICU_INSTALL_STAGING_CMDS
Martin> + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install
Martin> +endef
That's wrong/not needed.
Committed with those 2 fixes, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] imagemagick: remove fixed jpeg+tiff dependencies, add optional deps
From: Peter Korsgaard @ 2010-10-05 7:15 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=246c1f4deabe3872b050eef1cc087d3004c50515
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
For fontconfig/freetype/jpeg/libpng/librsvg/libxml2/tiff.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/imagemagick/Config.in | 2 -
package/imagemagick/imagemagick.mk | 54 ++++++++++++++++++++++++++++++++---
2 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/package/imagemagick/Config.in b/package/imagemagick/Config.in
index d6d6d8b..e66ded0 100644
--- a/package/imagemagick/Config.in
+++ b/package/imagemagick/Config.in
@@ -1,7 +1,5 @@
config BR2_PACKAGE_IMAGEMAGICK
bool "imagemagick"
- select BR2_PACKAGE_JPEG
- select BR2_PACKAGE_TIFF
help
ImageMagick(R) is a software suite to create, edit, and compose
bitmap images. It can read, convert and write images in a variety of
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index f80fe6f..f14adb9 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -10,8 +10,6 @@ IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
IMAGEMAGICK_LIBTOOL_PATCH = NO
IMAGEMAGICK_INSTALL_STAGING = YES
-IMAGEMAGICK_DEPENDENCIES = jpeg tiff
-
ifeq ($(BR2_LARGEFILE),y)
IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64
else
@@ -21,8 +19,6 @@ endif
IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
--without-perl \
--without-wmf \
- --without-xml \
- --without-rsvg \
--without-openexr \
--without-jp2 \
--without-jbig \
@@ -31,7 +27,55 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
--without-dps \
--without-gslib \
--without-fpx \
- --without-freetype \
--without-x
+ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
+IMAGEMAGICK_CONF_OPT += --with-fontconfig
+IMAGEMAGICK_DEPENDENCIES += fontconfig
+else
+IMAGEMAGISK_CONF_OPT += --without-fontconfig
+endif
+
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+IMAGEMAGICK_CONF_OPT += --with-freetype
+IMAGEMAGICK_DEPENDENCIES += freetype
+else
+IMAGEMAGISK_CONF_OPT += --without-freetype
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+IMAGEMAGICK_CONF_OPT += --with-jpeg
+IMAGEMAGICK_DEPENDENCIES += jpeg
+else
+IMAGEMAGISK_CONF_OPT += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+IMAGEMAGICK_CONF_OPT += --with-png
+IMAGEMAGICK_DEPENDENCIES += libpng
+else
+IMAGEMAGISK_CONF_OPT += --without-png
+endif
+
+ifeq ($(BR2_PACKAGE_LIBRSVG),y)
+IMAGEMAGICK_CONF_OPT += --with-rsvg
+IMAGEMAGICK_DEPENDENCIES += librsvg
+else
+IMAGEMAGISK_CONF_OPT += --without-rsvg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+IMAGEMAGICK_CONF_OPT += --with-xml
+IMAGEMAGICK_DEPENDENCIES += libxml2
+else
+IMAGEMAGISK_CONF_OPT += --without-xml
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+IMAGEMAGICK_CONF_OPT += --with-tiff
+IMAGEMAGICK_DEPENDENCIES += tiff
+else
+IMAGEMAGISK_CONF_OPT += --without-tiff
+endif
+
$(eval $(call AUTOTARGETS,package,imagemagick))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] package: add librsvg package
From: Peter Korsgaard @ 2010-10-05 7:15 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=31699a57d643cdc473123ff5701bcc33cd0ee4e6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
librsvg is a svg renderer.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/Config.in | 1 +
package/librsvg/Config.in | 14 ++++++++++++++
package/librsvg/librsvg.mk | 18 ++++++++++++++++++
4 files changed, 34 insertions(+), 1 deletions(-)
create mode 100644 package/librsvg/Config.in
create mode 100644 package/librsvg/librsvg.mk
diff --git a/CHANGES b/CHANGES
index c3f8a9e..4a382a2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,7 +21,7 @@
Alpha, Cris, IA64 and Sparc64 architecture support removed.
- New packages: xz
+ New packages: librsvg, xz
Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
diff --git a/package/Config.in b/package/Config.in
index ce6057b..5e08d59 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -263,6 +263,7 @@ source "package/libgail/Config.in"
source "package/libglade/Config.in"
source "package/libgtk2/Config.in"
source "package/libpng/Config.in"
+source "package/librsvg/Config.in"
source "package/libsvgtiny/Config.in"
source "package/libungif/Config.in"
source "package/pango/Config.in"
diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
new file mode 100644
index 0000000..fdb7d31
--- /dev/null
+++ b/package/librsvg/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_LIBRSVG
+ bool "librsvg"
+ select BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_CAIRO_PNG
+ select BR2_PACKAGE_PANGO
+ select BR2_PACKAGE_LIBGLIB2
+ depends on BR2_PACKAGE_LIBGTK2
+ depends on BR2_USE_WCHAR # glib2
+ help
+ The rsvg library is an efficient renderer for Scalable
+ Vector Graphics (SVG) pictures.
+
+ http://librsvg.sourceforge.net/
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
new file mode 100644
index 0000000..98bb25c
--- /dev/null
+++ b/package/librsvg/librsvg.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# librsvg
+#
+#############################################################
+
+LIBRSVG_VERSION_MAJOR:=2.26
+LIBRSVG_VERSION_MINOR:=3
+LIBRSVG_VERSION:=$(LIBRSVG_VERSION_MAJOR).$(LIBRSVG_VERSION_MINOR)
+LIBRSVG_SOURCE:=librsvg-$(LIBRSVG_VERSION).tar.gz
+LIBRSVG_SITE:=http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)/
+LIBRSVG_INSTALL_STAGING = YES
+LIBRSVG_INSTALL_TARGET = YES
+LIBRSVG_LIBTOOL_PATCH = NO
+LIBRSVG_CONF_OPT = --disable-tools
+LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 libgtk2
+
+$(eval $(call AUTOTARGETS,package,librsvg))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] imagemagick: convert to autotargets and bump to 6.6.4
From: Martin Banky @ 2010-10-05 7:15 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=85c45df2fa58a24ab220fd454867fa16311435e4
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
program-transform-name='s,,,' is needed, otherwise configure defines it
as $(platform)-$(cpu)-. During install, all executables are prepended
with this variable.
[Peter: disable libtool patch, remove unneeded/wrong staging install cmd]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 28 ++--
....3.4-add-errno-h-if-argz-h-does-not-exist.patch | 11 --
....6.4-add-errno-h-if-argz-h-does-not-exist.patch | 11 ++
package/imagemagick/imagemagick.mk | 147 ++------------------
4 files changed, 37 insertions(+), 160 deletions(-)
delete mode 100644 package/imagemagick/imagemagick-6.3.4-add-errno-h-if-argz-h-does-not-exist.patch
create mode 100644 package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch
diff --git a/CHANGES b/CHANGES
index 96b6397..c3f8a9e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,20 +29,20 @@
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf,
gtk2-themes, gtkperf, gvfs, haserl, hdparm, hostapd, hwdata,
- ifplugd, iperf, iproute2, iptables, iw, jpeg, kexec, kismet,
- less, libcgi, libcurl, libdaemon, libdnet, liberation,
- libevent, libeXosip2, libglade, libgtk2, libiconv, libidn,
- libmms, libnl, liboil, libosip2, libpcap, libpng, libtool,
- libungif, libxml2, libxslt, lighttpd, lite, lm-sensors,
- lockfile-progs, logrotate, m4, mdadm, mesa3d, metacity,
- mtd-utils, mysql_client, nano, nbd, ncftp, neon, netperf,
- netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd, openssh,
- openvpn, oprofile, pango, patch, pcre, php, pkg-config,
- prboom, radvd, rdesktop, ruby, qt, quagga, samba, sawman,
- sdl_mixer, sdl_sound, setserial, shared-mime-info, speex,
- sqlite, squashfs, strace, sylpheed, taglib, tcpdump, thttpd,
- tiff, tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
- which, wpa_supplicant,
+ ifplugd, imagemagick, iperf, iproute2, iptables, iw, jpeg,
+ kexec, kismet, less, libcgi, libcurl, libdaemon, libdnet,
+ liberation, libevent, libeXosip2, libglade, libgtk2, libiconv,
+ libidn, libmms, libnl, liboil, libosip2, libpcap, libpng,
+ libtool, libungif, libxml2, libxslt, lighttpd, lite,
+ lm-sensors, lockfile-progs, logrotate, m4, mdadm, mesa3d,
+ metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
+ netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
+ openssh, openvpn, oprofile, pango, patch, pcre, php,
+ pkg-config, prboom, radvd, rdesktop, ruby, qt, quagga, samba,
+ sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info,
+ speex, sqlite, squashfs, strace, sylpheed, taglib, tcpdump,
+ thttpd, tiff, tn5250, udev, udpcast, usbmount, usbutils,
+ vsftpd, vtun, which, wpa_supplicant,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
diff --git a/package/imagemagick/imagemagick-6.3.4-add-errno-h-if-argz-h-does-not-exist.patch b/package/imagemagick/imagemagick-6.3.4-add-errno-h-if-argz-h-does-not-exist.patch
deleted file mode 100644
index a11fdd2..0000000
--- a/package/imagemagick/imagemagick-6.3.4-add-errno-h-if-argz-h-does-not-exist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ImageMagick-6.3.4.old/configure 2007-05-12 05:49:25.000000000 +0200
-+++ ImageMagick-6.3.4.new/configure 2007-05-21 16:53:32.000000000 +0200
-@@ -9484,6 +9484,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #if HAVE_ARGZ_H
- # include <argz.h>
-+#else
-+# include <errno.h>
- #endif
-
- typedef error_t ac__type_new_;
diff --git a/package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch b/package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch
new file mode 100644
index 0000000..66a6747
--- /dev/null
+++ b/package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch
@@ -0,0 +1,11 @@
+--- a/configure 2010-09-26 17:05:45.000000000 -0700
++++ b/configure 2010-09-30 23:47:09.000000000 -0700
+@@ -20354,6 +20354,8 @@ done
+
+ ac_fn_c_check_type "$LINENO" "error_t" "ac_cv_type_error_t" "#if defined(HAVE_ARGZ_H)
+ # include <argz.h>
++#else
++# include <errno.h>
+ #endif
+ "
+ if test "x$ac_cv_type_error_t" = xyes; then :
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 9eb9d69..f80fe6f 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -3,50 +3,22 @@
# imagemagick
#
#############################################################
-IMAGEMAGICK_MAJOR:=6.4.8
-IMAGEMAGICK_VERSION:=$(IMAGEMAGICK_MAJOR)-4
-IMAGEMAGICK_SOURCE:=ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
-IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
-IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
-IMAGEMAGICK_CAT:=$(BZCAT)
-IMAGEMAGICK_LIB:=$(TARGET_DIR)/usr/lib/libMagickCore.so
+IMAGEMAGICK_MAJOR = 6.6.4
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-8
+IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
+IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
+IMAGEMAGICK_LIBTOOL_PATCH = NO
+IMAGEMAGICK_INSTALL_STAGING = YES
-IMAGEMAGICK_TARGET_BINARIES:=$(TARGET_DIR)/usr/bin/animate
-IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/compare
-IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/composite
-IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/conjure
-IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/display
-IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/import
-IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/mogrify
-IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/montage
-IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/convert
-
-IMAGEMAGICK_COPY:=cp -df --preserve=mode,ownership
-$(DL_DIR)/$(IMAGEMAGICK_SOURCE):
- $(call DOWNLOAD,$(IMAGEMAGICK_SITE),$(IMAGEMAGICK_SOURCE))
-
-$(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
- $(IMAGEMAGICK_CAT) $(DL_DIR)/$(IMAGEMAGICK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-$(IMAGEMAGICK_VERSION)\*.patch\*
- $(CONFIG_UPDATE) $(IMAGEMAGICK_DIR)/config
- touch $@
+IMAGEMAGICK_DEPENDENCIES = jpeg tiff
ifeq ($(BR2_LARGEFILE),y)
-IMAGEMAGICK_CONF_OPTS = ac_cv_sys_file_offset_bits=64
+IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64
else
-IMAGEMAGICK_CONF_OPTS = ac_cv_sys_file_offset_bits=32
+IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=32
endif
-$(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked
- (cd $(IMAGEMAGICK_DIR); rm -f config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
+IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
--without-perl \
--without-wmf \
--without-xml \
@@ -60,101 +32,6 @@ $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked
--without-gslib \
--without-fpx \
--without-freetype \
- --without-x \
- $(IMAGEMAGICK_CONF_OPTS) \
- )
- touch $@
-
-$(IMAGEMAGICK_DIR)/.compiled: $(IMAGEMAGICK_DIR)/.configured
- $(MAKE) -C $(IMAGEMAGICK_DIR)
- touch $@
-
-$(STAGING_DIR)/usr/lib/libMagickCore.a: $(IMAGEMAGICK_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(IMAGEMAGICK_DIR) install
- touch -c $@
-
-$(IMAGEMAGICK_LIB): $(STAGING_DIR)/usr/lib/libMagickCore.a
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/lib/libMagickWand.so* $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libMagickWand.so*
- mkdir -p $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)
- $(IMAGEMAGICK_COPY) -r $(STAGING_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR) $(TARGET_DIR)/usr/lib
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/lib/libMagickCore.so* $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(IMAGEMAGICK_LIB)*
- touch -c $@
-
-$(IMAGEMAGICK_DIR)/.libinstall: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_DIR)/libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/coders
- $(IMAGEMAGICK_DIR)/libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/filters
- touch $@
-
-$(TARGET_DIR)/usr/bin/animate: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-animate $(TARGET_DIR)/usr/bin/animate
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/animate
- touch $@
-
-$(TARGET_DIR)/usr/bin/compare: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-compare $(TARGET_DIR)/usr/bin/compare
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/compare
- touch $@
-
-$(TARGET_DIR)/usr/bin/composite: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-composite $(TARGET_DIR)/usr/bin/composite
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/composite
- touch $@
-
-$(TARGET_DIR)/usr/bin/conjure: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-conjure $(TARGET_DIR)/usr/bin/conjure
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/conjure
- touch $@
-
-$(TARGET_DIR)/usr/bin/display: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-display $(TARGET_DIR)/usr/bin/display
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/display
- touch $@
-
-$(TARGET_DIR)/usr/bin/import: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-import $(TARGET_DIR)/usr/bin/import
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/import
- touch $@
+ --without-x
-$(TARGET_DIR)/usr/bin/mogrify: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-mogrify $(TARGET_DIR)/usr/bin/mogrify
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/mogrify
- touch $@
-
-$(TARGET_DIR)/usr/bin/montage: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-montage $(TARGET_DIR)/usr/bin/montage
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/montage
- touch $@
-
-$(TARGET_DIR)/usr/bin/convert: $(IMAGEMAGICK_LIB)
- $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-convert $(TARGET_DIR)/usr/bin/convert
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/convert
- touch $@
-
-imagemagick: jpeg tiff $(IMAGEMAGICK_LIB) \
- $(IMAGEMAGICK_DIR)/.libinstall \
- $(IMAGEMAGICK_TARGET_BINARIES)
-
-imagemagick-source: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
-
-imagemagick-unpacked:$(IMAGEMAGICK_DIR)/.unpacked
-
-imagemagick-clean:
- for target_binary in $(IMAGEMAGICK_TARGET_BINARIES); do \
- rm -f $$target_binary; \
- done
- rm -rf $(TARGET_DIR)/usr/lib/libMagick*
- rm -rf $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)
- -$(MAKE) -C $(IMAGEMAGICK_DIR) clean
-
-imagemagick-dirclean:
- rm -rf $(IMAGEMAGICK_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y)
-TARGETS+=imagemagick
-endif
+$(eval $(call AUTOTARGETS,package,imagemagick))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [Bug 759] Sysstat build broken without libintl
From: bugzilla at busybox.net @ 2010-10-05 6:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-759-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=759
--- Comment #7 from Lionel Landwerlin <llandwerlin@gmail.com> ---
I'm still having this problem too.
To reproduce this bug you have to use an internal toolchain without locale
support. Sysstat always try to use intl symbols, but never adds -lintl link
flag.
So basicly sysstat's makefile/configure is broken. It should be able to detect
whether or not -lintl is required.
(In reply to comment #6)
> libsyscom.a -s
> sadc.o: In function `p_write_error':
> sadc.c:(.text+0x13c): undefined reference to `libintl_gettext'
> sadc.o: In function `usage':
> sadc.c:(.text+0x1dc): undefined reference to `libintl_gettext'
> sadc.c:(.text+0x218): undefined reference to `libintl_gettext'
> sadc.o: In function `setup_file_hdr':
> sadc.c:(.text+0x1184): undefined reference to `libintl_gettext'
> sadc.o: In function `create_sa_file':
> sadc.c:(.text+0x13f4): undefined reference to `libintl_gettext'
> sadc.o:sadc.c:(.text+0x17e8): more undefined references to `libintl_gettext'
> follow
> libsyscom.a(common.o): In function `init_nls':
> common.c:(.text+0xabc): undefined reference to `libintl_bindtextdomain'
> common.c:(.text+0xad8): undefined reference to `libintl_textdomain'
> libsyscom.a(common.o): In function `print_version':
> common.c:(.text+0x139c): undefined reference to `libintl_gettext'
> libsyscom.a(ioconf.o): In function `transform_devmapname':
> ioconf.c:(.text+0x214): undefined reference to `libintl_gettext'
> collect2: ld returned 1 exit status
> make[1]: *** [sadc] Error 1
> make[1]: *** Waiting for unfinished jobs....
> sar.o: In function `print_usage_title':
> sar.c:(.text+0xc8): undefined reference to `libintl_gettext'
> sar.o: In function `print_read_error':
> sar.c:(.text+0x124): undefined reference to `libintl_gettext'
> sar.o: In function `display_help':
> sar.c:(.text+0x19c): undefined reference to `libintl_gettext'
> sar.c:(.text+0x1cc): undefined reference to `libintl_gettext'
> sar.c:(.text+0x1fc): undefined reference to `libintl_gettext'
> sar.o:sar.c:(.text+0x22c): more undefined references to `libintl_gettext'
> follow
> libsyscom.a(common.o): In function `init_nls':
> common.c:(.text+0xabc): undefined reference to `libintl_bindtextdomain'
> common.c:(.text+0xad8): undefined reference to `libintl_textdomain'
> libsyscom.a(common.o): In function `print_version':
> common.c:(.text+0x139c): undefined reference to `libintl_gettext'
> libsyscom.a(ioconf.o): In function `transform_devmapname':
> ioconf.c:(.text+0x214): undefined reference to `libintl_gettext'
> collect2: ld returned 1 exit status
> make[1]: *** [sar] Error 1
> make[1]: Leaving directory
> `/home/sergio/hardware/moviecube/buildroot/output/build/sysstat-9.0.5'
> make: ***
> [/home/sergio/hardware/moviecube/buildroot/output/build/sysstat-9.0.5/.stamp_built]
> Error 2
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 759] Sysstat build broken without libintl
From: bugzilla at busybox.net @ 2010-10-05 4:11 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-759-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=759
S?rgio <sergio@sergiomb.no-ip.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|RESOLVED |REOPENED
Resolution|INVALID |
--- Comment #6 from S?rgio <sergio@sergiomb.no-ip.org> ---
If I may reopen this bug, I mean serious, if you don't approve this reopen ,
please close it and please left a note on what I should do.
I have a similar compile error but I have intl enabled, my Makefile misses a
"-lintl" . I use builroot from git on fedora13.x86_64 and try build to mipsel
arch.
>>> sysstat 9.0.5 Building
PATH="/home/sergio/hardware/moviecube/buildroot/output/host/bin:/home/sergio/hardware/moviecube/buildroot/output/host/usr/bin:/home/sergio/hardware/moviecube/buildroot/output/host/usr/sbin/:/usr/lib64/qt-3.3/bin:/usr/kerberos/sbin:/usr/kerberos/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/games:/usr/local/sbin:/usr/sbin:/sbin:/home/sergio/bin"
PERLLIB="/home/sergio/hardware/moviecube/buildroot/output/host/usr/lib/perl"
/usr/bin/make -j2 -C
/home/sergio/hardware/moviecube/buildroot/output/build/sysstat-9.0.5/
make[1]: Entering directory
`/home/sergio/hardware/moviecube/buildroot/output/build/sysstat-9.0.5'
/home/sergio/hardware/moviecube/buildroot/output/staging/usr/bin/mipsel-unknown-linux-uclibc-gcc
--sysroot=/home/sergio/hardware/moviecube/buildroot/output/staging -o sadc -Os
-pipe -Os -mtune=mips32r2 -mabi=32 -msoft-float -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-I/home/sergio/hardware/moviecube/buildroot/output/staging/usr/include
-I/home/sergio/hardware/moviecube/buildroot/output/staging/include -Wall
-Wstrict-prototypes -pipe -O2 sadc.o act_sadc.o sa_wrap.o sa_common.o
librdstats.a libsyscom.a -s
/home/sergio/hardware/moviecube/buildroot/output/staging/usr/bin/mipsel-unknown-linux-uclibc-gcc
--sysroot=/home/sergio/hardware/moviecube/buildroot/output/staging -o sar -Os
-pipe -Os -mtune=mips32r2 -mabi=32 -msoft-float -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-I/home/sergio/hardware/moviecube/buildroot/output/staging/usr/include
-I/home/sergio/hardware/moviecube/buildroot/output/staging/include -Wall
-Wstrict-prototypes -pipe -O2 sar.o act_sar.o sa_common.o pr_stats.o
libsyscom.a -s
sadc.o: In function `p_write_error':
sadc.c:(.text+0x13c): undefined reference to `libintl_gettext'
sadc.o: In function `usage':
sadc.c:(.text+0x1dc): undefined reference to `libintl_gettext'
sadc.c:(.text+0x218): undefined reference to `libintl_gettext'
sadc.o: In function `setup_file_hdr':
sadc.c:(.text+0x1184): undefined reference to `libintl_gettext'
sadc.o: In function `create_sa_file':
sadc.c:(.text+0x13f4): undefined reference to `libintl_gettext'
sadc.o:sadc.c:(.text+0x17e8): more undefined references to `libintl_gettext'
follow
libsyscom.a(common.o): In function `init_nls':
common.c:(.text+0xabc): undefined reference to `libintl_bindtextdomain'
common.c:(.text+0xad8): undefined reference to `libintl_textdomain'
libsyscom.a(common.o): In function `print_version':
common.c:(.text+0x139c): undefined reference to `libintl_gettext'
libsyscom.a(ioconf.o): In function `transform_devmapname':
ioconf.c:(.text+0x214): undefined reference to `libintl_gettext'
collect2: ld returned 1 exit status
make[1]: *** [sadc] Error 1
make[1]: *** Waiting for unfinished jobs....
sar.o: In function `print_usage_title':
sar.c:(.text+0xc8): undefined reference to `libintl_gettext'
sar.o: In function `print_read_error':
sar.c:(.text+0x124): undefined reference to `libintl_gettext'
sar.o: In function `display_help':
sar.c:(.text+0x19c): undefined reference to `libintl_gettext'
sar.c:(.text+0x1cc): undefined reference to `libintl_gettext'
sar.c:(.text+0x1fc): undefined reference to `libintl_gettext'
sar.o:sar.c:(.text+0x22c): more undefined references to `libintl_gettext'
follow
libsyscom.a(common.o): In function `init_nls':
common.c:(.text+0xabc): undefined reference to `libintl_bindtextdomain'
common.c:(.text+0xad8): undefined reference to `libintl_textdomain'
libsyscom.a(common.o): In function `print_version':
common.c:(.text+0x139c): undefined reference to `libintl_gettext'
libsyscom.a(ioconf.o): In function `transform_devmapname':
ioconf.c:(.text+0x214): undefined reference to `libintl_gettext'
collect2: ld returned 1 exit status
make[1]: *** [sar] Error 1
make[1]: Leaving directory
`/home/sergio/hardware/moviecube/buildroot/output/build/sysstat-9.0.5'
make: ***
[/home/sergio/hardware/moviecube/buildroot/output/build/sysstat-9.0.5/.stamp_built]
Error 2
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [PATCH 1/3] libgtk2: bump to version 2.20.1 and mark Gtk/DirectFB as broken
From: Martin Banky @ 2010-10-05 2:16 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20101003131301.6a434c30@surf>
Thomas,
Do you have a config file that I can use to build libgtk2? I have
gtk2-engines converted to autotargets, and I need to test it, but I don't
know how to build an X server.
Thanks,
Martin
On Sun, Oct 3, 2010 at 4:13 AM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:
> On Thu, 30 Sep 2010 14:35:19 +0200
> Peter Korsgaard <jacmet@uclibc.org> wrote:
>
> > Thomas> Argh, I checked http://www.gtk.org/download-linux.html
> > Thomas> yesterday, and it still advertise Gtk 2.20 and Glib 2.24.
> >
> > Thomas> I will bump those versions, yes, and mark the DirectFB
> > Thomas> support as working again.
> >
> > Ok, I'll put your pull request on hold for now then. Please resend
> > once ready.
>
> Unfortunately, things are not that simple.
>
> In order to reduce the number of dependencies needed to build
> host-libgtk2 (in which a few tools are needed to build the target
> libgtk2), we apply a patch to libgtk2 configure.in file. Applying a
> patch to the configure.in obviously means that host-libgtk2 needs to be
> auto-reconfigured.
>
> However, libgtk2 2.22 now requires libtool 2.2, and we only have
> libtool 1.5. So unless we upgrade libtool to 2.2, it is not possible to
> autoreconfigure libgtk2 and therefore not possible to apply a patch to
> its configure.in file.
>
> We *really* need to take a decision on the libtool stuff. I've sent a
> summary of the two proposals and would like to see some more reactions
> to it in order to move forward on this topic.
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20101004/b589699d/attachment.html>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox