* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2008-08-27 7:29 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2008-08-27 7:29 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-27 00:29:09 -0700 (Wed, 27 Aug 2008)
New Revision: 23232
Log:
libdaemon: bump version
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2008-08-27 05:27:27 UTC (rev 23231)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2008-08-27 07:29:09 UTC (rev 23232)
@@ -11,7 +11,7 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-LIBDAEMON_VERSION:=0.12
+LIBDAEMON_VERSION:=0.13
LIBDAEMON_NAME:=libdaemon-$(LIBDAEMON_VERSION)
LIBDAEMON_DIR:=$(BUILD_DIR)/$(LIBDAEMON_NAME)
LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2008-08-27 7:29 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2008-08-27 7:29 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-27 00:29:16 -0700 (Wed, 27 Aug 2008)
New Revision: 23234
Log:
libdaemon: convert to Makefile.autotools.in format
Removed:
trunk/buildroot/package/libdaemon/libdir-la.patch
trunk/buildroot/package/libdaemon/xcompile-setpgrp.patch
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2008-08-27 07:29:13 UTC (rev 23233)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2008-08-27 07:29:16 UTC (rev 23234)
@@ -3,98 +3,17 @@
# libdaemon (UNIX daemon library)
#
#############################################################
-# Copyright 2003-2005 Lennart Poettering <mzqnrzba@0pointer.de>
-#
-# This library is free software; you can redistribute it
-# and/or modify it under the terms of the GNU Lesser General
-# Public License as published by the Free Software Foundation
-# either version 2.1 of the License, or (at your option) any
-# later version.
LIBDAEMON_VERSION:=0.13
-LIBDAEMON_NAME:=libdaemon-$(LIBDAEMON_VERSION)
-LIBDAEMON_DIR:=$(BUILD_DIR)/$(LIBDAEMON_NAME)
+LIBDAEMON_SOURCE:=libdaemon-$(LIBDAEMON_VERSION).tar.gz
LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/
-LIBDAEMON_SOURCE:=$(LIBDAEMON_NAME).tar.gz
-LIBDAEMON_DESTDIR:=$(STAGING_DIR)/usr/lib
-LIBDAEMON_CAT:=$(ZCAT)
+LIBDAEMON_AUTORECONF:=no
+LIBDAEMON_INSTALL_STAGING:=YES
+LIBDAEMON_INSTALL_TARGET:=YES
+LIBDAEMON_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip
+LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no
+LIBDAEMON_CONF_OPT:=--disable-lynx $(DISABLE_NLS) $(DISABLE_LARGEFILE)
-$(DL_DIR)/$(LIBDAEMON_SOURCE):
- $(WGET) -P $(DL_DIR) $(LIBDAEMON_SITE)/$(LIBDAEMON_SOURCE)
+LIBDAEMON_DEPENDENCIES:=uclibc pkgconfig
-libdaemon-source: $(DL_DIR)/$(LIBDAEMON_SOURCE)
-
-libdaemon-unpacked: $(LIBDAEMON_DIR)/.unpacked
-$(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
- $(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
- touch $@
-
-libdaemon-configured: $(LIBDAEMON_DIR)/.configured
-$(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
- (cd $(LIBDAEMON_DIR) && rm -rf config.cache && libtoolize --copy --force && autoreconf)
- $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
- (cd $(LIBDAEMON_DIR) && \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- $(DISABLE_NLS) \
- $(DISABLE_LARGEFILE) \
- --disable-lynx \
- --disable-shared \
- )
- touch $@
-
-$(LIBDAEMON_DIR)/.compiled: $(LIBDAEMON_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) LIBTOOL=$(LIBDAEMON_DIR)/libtool -C $(LIBDAEMON_DIR)
- touch $@
-
-$(LIBDAEMON_DESTDIR)/libdaemon.a: $(LIBDAEMON_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBDAEMON_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdaemon.la
- touch -c $@
-
-#$(TARGET_DIR)/usr/lib/libdaemon.a: $(LIBDAEMON_DESTDIR)/libdaemon.a
-# -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdaemon.a
-
-libdaemon: uclibc pkgconfig $(LIBDAEMON_DESTDIR)/libdaemon.a
-
-libdaemon-unpacked: $(LIBDAEMON_DIR)/.unpacked
-
-libdaemon-clean:
- -$(MAKE) -C $(LIBDAEMON_DIR) clean
-
-libdaemon-patch-prep: libdaemon-dirclean libdaemon-unpacked
- cp -af $(LIBDAEMON_DIR) $(LIBDAEMON_DIR)-0rig
-
-libdaemon-patch:
- (cd $(BUILD_DIR); \
- diff -urN $(LIBDAEMON_NAME)-0rig $(LIBDAEMON_NAME) > ../../$(LIBDAEMON_NAME)-$(DATE).patch || echo)
-
-libdaemon-dirclean:
- rm -rf $(LIBDAEMON_DIR)
- rm -rf $(LIBDAEMON_DIR)-0rig
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LIBDAEMON)),y)
-TARGETS+=libdaemon
-endif
+$(eval $(call AUTOTARGETS,package,libdaemon))
Deleted: trunk/buildroot/package/libdaemon/libdir-la.patch
===================================================================
--- trunk/buildroot/package/libdaemon/libdir-la.patch 2008-08-27 07:29:13 UTC (rev 23233)
+++ trunk/buildroot/package/libdaemon/libdir-la.patch 2008-08-27 07:29:16 UTC (rev 23234)
@@ -1,77 +0,0 @@
---- libdaemon/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700
-+++ libdaemon/ltmain.sh 2007-01-13 14:36:53.000000000 -0700
-@@ -231,8 +231,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2279,8 +2280,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- else
- if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-@@ -2754,6 +2761,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5141,6 +5158,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5459,10 +5480,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
Deleted: trunk/buildroot/package/libdaemon/xcompile-setpgrp.patch
===================================================================
--- trunk/buildroot/package/libdaemon/xcompile-setpgrp.patch 2008-08-27 07:29:13 UTC (rev 23233)
+++ trunk/buildroot/package/libdaemon/xcompile-setpgrp.patch 2008-08-27 07:29:16 UTC (rev 23234)
@@ -1,11 +0,0 @@
---- libdaemon-0.10/configure.ac.cls 2005-11-24 05:38:53.000000000 -0800
-+++ libdaemon-0.10/configure.ac 2006-09-25 08:16:33.000000000 -0700
-@@ -85,7 +85,7 @@
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS([select strerror dup2 memset strrchr])
- AC_TYPE_MODE_T
--AC_FUNC_SETPGRP
-+dnl AC_FUNC_SETPGRP
- AC_TYPE_SIGNAL
- AC_TYPE_SIZE_T
-
^ permalink raw reply [flat|nested] 16+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2008-07-04 9:48 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2008-07-04 9:48 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-04 02:48:25 -0700 (Fri, 04 Jul 2008)
New Revision: 22625
Log:
Make libdaemon use the config files from Buildroot (previously replaced by libtoolize)
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2008-07-04 08:39:35 UTC (rev 22624)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2008-07-04 09:48:25 UTC (rev 22625)
@@ -24,14 +24,16 @@
libdaemon-source: $(DL_DIR)/$(LIBDAEMON_SOURCE)
+libdaemon-unpacked: $(LIBDAEMON_DIR)/.unpacked
$(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
$(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
- $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
touch $@
+libdaemon-configured: $(LIBDAEMON_DIR)/.configured
$(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
(cd $(LIBDAEMON_DIR) && rm -rf config.cache && libtoolize --copy --force && autoreconf)
+ $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
(cd $(LIBDAEMON_DIR) && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2008-04-24 13:16 ninevoltz at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-24 13:16 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-24 06:16:39 -0700 (Thu, 24 Apr 2008)
New Revision: 21833
Log:
small fix for libdaemon
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2008-04-24 13:15:30 UTC (rev 21832)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2008-04-24 13:16:39 UTC (rev 21833)
@@ -31,7 +31,7 @@
touch $@
$(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
- (cd $(LIBDAEMON_DIR) && rm -rf config.cache && autoreconf)
+ (cd $(LIBDAEMON_DIR) && rm -rf config.cache && libtoolize --copy --force && autoreconf)
(cd $(LIBDAEMON_DIR) && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2007-11-28 8:55 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-11-28 8:55 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-28 00:55:40 -0800 (Wed, 28 Nov 2007)
New Revision: 20558
Log:
Move libdaemon from lib to usr/lib, update libdaemon.la
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-11-28 07:09:57 UTC (rev 20557)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-11-28 08:55:40 UTC (rev 20558)
@@ -16,6 +16,7 @@
LIBDAEMON_DIR:=$(BUILD_DIR)/$(LIBDAEMON_NAME)
LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/
LIBDAEMON_SOURCE:=$(LIBDAEMON_NAME).tar.gz
+LIBDAEMON_DESTDIR:=$(STAGING_DIR)/usr/lib
LIBDAEMON_CAT:=$(ZCAT)
$(DL_DIR)/$(LIBDAEMON_SOURCE):
@@ -42,7 +43,7 @@
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
- --libdir=/lib \
+ --libdir=/usr/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
@@ -58,17 +59,18 @@
touch $@
$(LIBDAEMON_DIR)/.compiled: $(LIBDAEMON_DIR)/.configured
- $(MAKE) LIBTOOL=$(LIBDAEMON_DIR)/libtool -C $(LIBDAEMON_DIR)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) LIBTOOL=$(LIBDAEMON_DIR)/libtool -C $(LIBDAEMON_DIR)
touch $@
-$(STAGING_DIR)/lib/libdaemon.a: $(LIBDAEMON_DIR)/.compiled
+$(LIBDAEMON_DESTDIR)/libdaemon.a: $(LIBDAEMON_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBDAEMON_DIR) install
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdaemon.la
touch -c $@
-#$(TARGET_DIR)/usr/lib/libdaemon.a: $(STAGING_DIR)/lib/libdaemon.a
+#$(TARGET_DIR)/usr/lib/libdaemon.a: $(LIBDAEMON_DESTDIR)/libdaemon.a
# -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdaemon.a
-libdaemon: uclibc pkgconfig $(STAGING_DIR)/lib/libdaemon.a
+libdaemon: uclibc pkgconfig $(LIBDAEMON_DESTDIR)/libdaemon.a
libdaemon-unpacked: $(LIBDAEMON_DIR)/.unpacked
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2007-09-20 15:35 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-09-20 15:35 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-20 08:35:26 -0700 (Thu, 20 Sep 2007)
New Revision: 19910
Log:
Make sure libdaemon finds AC_PROG_LIBTOOL
Removed:
trunk/buildroot/package/libdaemon/libdaemon-0.10.patch.bz2
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Deleted: trunk/buildroot/package/libdaemon/libdaemon-0.10.patch.bz2
===================================================================
(Binary files differ)
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-09-20 12:07:10 UTC (rev 19909)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-09-20 15:35:26 UTC (rev 19910)
@@ -26,17 +26,11 @@
$(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
$(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
-# Ulf, what was this supposed to fix? Your patch is broken
-# (hardcoded for /home/ulf/..)
-# mkdir -p $(PROJECT_BUILD_DIR)/patches
-# $(BZCAT) package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
-# > $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
-# toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch
-# $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
+ $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
touch $@
$(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
- (cd $(LIBDAEMON_DIR) && rm -rf config.cache && autoconf)
+ (cd $(LIBDAEMON_DIR) && rm -rf config.cache && autoreconf)
(cd $(LIBDAEMON_DIR) && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2007-09-03 9:00 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2007-09-03 9:00 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-09-03 02:00:18 -0700 (Mon, 03 Sep 2007)
New Revision: 19772
Log:
Bumped version
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-09-03 08:56:06 UTC (rev 19771)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-09-03 09:00:18 UTC (rev 19772)
@@ -11,7 +11,7 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-LIBDAEMON_VERSION:=0.10
+LIBDAEMON_VERSION:=0.12
LIBDAEMON_NAME:=libdaemon-$(LIBDAEMON_VERSION)
LIBDAEMON_DIR:=$(BUILD_DIR)/$(LIBDAEMON_NAME)
LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2007-09-03 8:56 jacmet at uclibc.org
2007-09-03 8:54 ` Ulf Samuelsson
0 siblings, 1 reply; 16+ messages in thread
From: jacmet at uclibc.org @ 2007-09-03 8:56 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-09-03 01:56:06 -0700 (Mon, 03 Sep 2007)
New Revision: 19771
Log:
Don't apply broken patch from r19595 with hardcoded path names.
Ulf, what was this supposed to fix?
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-09-03 06:26:06 UTC (rev 19770)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-09-03 08:56:06 UTC (rev 19771)
@@ -26,11 +26,13 @@
$(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
$(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
- mkdir -p $(PROJECT_BUILD_DIR)/patches
- $(BZCAT) package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
- > $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
- toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch
- $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
+# Ulf, what was this supposed to fix? Your patch is broken
+# (hardcoded for /home/ulf/..)
+# mkdir -p $(PROJECT_BUILD_DIR)/patches
+# $(BZCAT) package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
+# > $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
+# toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch
+# $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
touch $(LIBDAEMON_DIR)/.unpacked
$(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
2007-09-03 8:56 jacmet at uclibc.org
@ 2007-09-03 8:54 ` Ulf Samuelsson
0 siblings, 0 replies; 16+ messages in thread
From: Ulf Samuelsson @ 2007-09-03 8:54 UTC (permalink / raw)
To: buildroot
m?n 2007-09-03 klockan 01:56 -0700 skrev jacmet at uclibc.org:
> Author: jacmet
> Date: 2007-09-03 01:56:06 -0700 (Mon, 03 Sep 2007)
> New Revision: 19771
>
> Log:
> Don't apply broken patch from r19595 with hardcoded path names.
> Ulf, what was this supposed to fix?
>
>
> Modified:
> trunk/buildroot/package/libdaemon/libdaemon.mk
>
OK I see the problem.
It does not build for ARM as is,
so I ran autotools, after which it builds.
How run autotools to generate an address relative to the buildroot tree?
>
> Changeset:
> Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
> ===================================================================
> --- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-09-03 06:26:06 UTC (rev 19770)
> +++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-09-03 08:56:06 UTC (rev 19771)
> @@ -26,11 +26,13 @@
> $(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
> $(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
> - mkdir -p $(PROJECT_BUILD_DIR)/patches
> - $(BZCAT) package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
> - > $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
> - toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch
> - $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
> +# Ulf, what was this supposed to fix? Your patch is broken
> +# (hardcoded for /home/ulf/..)
> +# mkdir -p $(PROJECT_BUILD_DIR)/patches
> +# $(BZCAT) package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
> +# > $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
> +# toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch
> +# $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
> touch $(LIBDAEMON_DIR)/.unpacked
>
> $(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
--
Best Regards,
Ulf Samuelsson
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2007-08-21 14:27 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-08-21 14:27 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-21 07:27:57 -0700 (Tue, 21 Aug 2007)
New Revision: 19617
Log:
Use $(BZCAT) instead of bzcat
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-08-21 14:20:59 UTC (rev 19616)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-08-21 14:27:57 UTC (rev 19617)
@@ -27,7 +27,7 @@
$(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
mkdir -p $(PROJECT_BUILD_DIR)/patches
- bzcat package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
+ $(BZCAT) package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
> $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch
$(CONFIG_UPDATE) $(LIBDAEMON_DIR)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2007-08-21 1:32 ulf at uclibc.org
2007-08-21 8:23 ` Bernhard Fischer
0 siblings, 1 reply; 16+ messages in thread
From: ulf at uclibc.org @ 2007-08-21 1:32 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-20 18:32:37 -0700 (Mon, 20 Aug 2007)
New Revision: 19595
Log:
Fix configure problem with libdaemon, by patching result from autotools
Added:
trunk/buildroot/package/libdaemon/libdaemon-0.10.patch.bz2
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Added: trunk/buildroot/package/libdaemon/libdaemon-0.10.patch.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/buildroot/package/libdaemon/libdaemon-0.10.patch.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-08-21 01:28:12 UTC (rev 19594)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-08-21 01:32:37 UTC (rev 19595)
@@ -12,9 +12,10 @@
# later version.
LIBDAEMON_VERSION:=0.10
-LIBDAEMON_DIR:=$(BUILD_DIR)/libdaemon-$(LIBDAEMON_VERSION)
+LIBDAEMON_NAME:=libdaemon-$(LIBDAEMON_VERSION)
+LIBDAEMON_DIR:=$(BUILD_DIR)/$(LIBDAEMON_NAME)
LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/
-LIBDAEMON_SOURCE:=libdaemon-$(LIBDAEMON_VERSION).tar.gz
+LIBDAEMON_SOURCE:=$(LIBDAEMON_NAME).tar.gz
LIBDAEMON_CAT:=$(ZCAT)
$(DL_DIR)/$(LIBDAEMON_SOURCE):
@@ -25,6 +26,10 @@
$(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
$(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
+ mkdir -p $(PROJECT_BUILD_DIR)/patches
+ bzcat package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
+ > $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
+ toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch
$(CONFIG_UPDATE) $(LIBDAEMON_DIR)
touch $(LIBDAEMON_DIR)/.unpacked
@@ -57,7 +62,7 @@
touch $(LIBDAEMON_DIR)/.configured
$(LIBDAEMON_DIR)/.compiled: $(LIBDAEMON_DIR)/.configured
- $(MAKE) -C $(LIBDAEMON_DIR)
+ $(MAKE) LIBTOOL=$(LIBDAEMON_DIR)/libtool -C $(LIBDAEMON_DIR)
touch $(LIBDAEMON_DIR)/.compiled
$(STAGING_DIR)/lib/libdaemon.a: $(LIBDAEMON_DIR)/.compiled
@@ -65,15 +70,25 @@
touch -c $(STAGING_DIR)/lib/libdaemon.a
#$(TARGET_DIR)/usr/lib/libdaemon.a: $(STAGING_DIR)/lib/libdaemon.a
-# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libdaemon.a
+# -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdaemon.a
libdaemon: uclibc pkgconfig $(STAGING_DIR)/lib/libdaemon.a
+libdaemon-unpacked: $(LIBDAEMON_DIR)/.unpacked
+
libdaemon-clean:
-$(MAKE) -C $(LIBDAEMON_DIR) clean
+libdaemon-patch-prep: libdaemon-dirclean libdaemon-unpacked
+ cp -af $(LIBDAEMON_DIR) $(LIBDAEMON_DIR)-0rig
+
+libdaemon-patch:
+ (cd $(BUILD_DIR); \
+ diff -urN $(LIBDAEMON_NAME)-0rig $(LIBDAEMON_NAME) > ../../$(LIBDAEMON_NAME)-$(DATE).patch || echo)
+
libdaemon-dirclean:
rm -rf $(LIBDAEMON_DIR)
+ rm -rf $(LIBDAEMON_DIR)-0rig
#############################################################
#
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
2007-08-21 1:32 ulf at uclibc.org
@ 2007-08-21 8:23 ` Bernhard Fischer
2007-08-21 14:15 ` Ulf Samuelsson
0 siblings, 1 reply; 16+ messages in thread
From: Bernhard Fischer @ 2007-08-21 8:23 UTC (permalink / raw)
To: buildroot
On Mon, Aug 20, 2007 at 06:32:37PM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-08-20 18:32:37 -0700 (Mon, 20 Aug 2007)
>New Revision: 19595
>
>Log:
>Fix configure problem with libdaemon, by patching result from autotools
>
>Added:
> trunk/buildroot/package/libdaemon/libdaemon-0.10.patch.bz2
>
>Modified:
> trunk/buildroot/package/libdaemon/libdaemon.mk
>
>
>Changeset:
>Added: trunk/buildroot/package/libdaemon/libdaemon-0.10.patch.bz2
>===================================================================
>(Binary files differ)
>
>
>Property changes on: trunk/buildroot/package/libdaemon/libdaemon-0.10.patch.bz2
>___________________________________________________________________
>Name: svn:mime-type
> + application/octet-stream
>
>Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
>===================================================================
>--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-08-21 01:28:12 UTC (rev 19594)
>+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-08-21 01:32:37 UTC (rev 19595)
>@@ -12,9 +12,10 @@
> # later version.
>
> LIBDAEMON_VERSION:=0.10
>-LIBDAEMON_DIR:=$(BUILD_DIR)/libdaemon-$(LIBDAEMON_VERSION)
>+LIBDAEMON_NAME:=libdaemon-$(LIBDAEMON_VERSION)
>+LIBDAEMON_DIR:=$(BUILD_DIR)/$(LIBDAEMON_NAME)
> LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/
>-LIBDAEMON_SOURCE:=libdaemon-$(LIBDAEMON_VERSION).tar.gz
>+LIBDAEMON_SOURCE:=$(LIBDAEMON_NAME).tar.gz
> LIBDAEMON_CAT:=$(ZCAT)
>
> $(DL_DIR)/$(LIBDAEMON_SOURCE):
>@@ -25,6 +26,10 @@
> $(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
> $(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
>+ mkdir -p $(PROJECT_BUILD_DIR)/patches
>+ bzcat package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
This will break on a variety of hosts. Use BR2_BZCAT instead (i.e.
honour what the user told us).
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
2007-08-21 8:23 ` Bernhard Fischer
@ 2007-08-21 14:15 ` Ulf Samuelsson
0 siblings, 0 replies; 16+ messages in thread
From: Ulf Samuelsson @ 2007-08-21 14:15 UTC (permalink / raw)
To: buildroot
> > $(DL_DIR)/$(LIBDAEMON_SOURCE):
> >@@ -25,6 +26,10 @@
> > $(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
> > $(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> > toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
> >+ mkdir -p $(PROJECT_BUILD_DIR)/patches
> >+ bzcat package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
>
> This will break on a variety of hosts. Use BR2_BZCAT instead (i.e.
> honour what the user told us).
Fixed in r19617.
It is a bit irritating to load the tarball with a lot of stuff
just because autotools versions differ in distribution.
What about generating host-autotools in STAGING_DIR?
--
Best Regards,
Ulf Samuelsson
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2007-07-17 12:06 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-07-17 12:06 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-17 05:06:01 -0700 (Tue, 17 Jul 2007)
New Revision: 19130
Log:
Update configure files for libdaemon
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-07-17 12:04:36 UTC (rev 19129)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-07-17 12:06:01 UTC (rev 19130)
@@ -25,6 +25,7 @@
$(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
$(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
+ $(CONFIG_UPDATE) $(LIBDAEMON_DIR)
touch $(LIBDAEMON_DIR)/.unpacked
$(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2007-01-22 18:15 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-22 18:15 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-22 10:15:15 -0800 (Mon, 22 Jan 2007)
New Revision: 17469
Log:
properly depend on pkgconfig
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2007-01-22 17:50:21 UTC (rev 17468)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2007-01-22 18:15:15 UTC (rev 17469)
@@ -67,7 +67,7 @@
#$(TARGET_DIR)/usr/lib/libdaemon.a: $(STAGING_DIR)/lib/libdaemon.a
# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libdaemon.a
-libdaemon: uclibc $(STAGING_DIR)/lib/libdaemon.a
+libdaemon: uclibc pkgconfig $(STAGING_DIR)/lib/libdaemon.a
libdaemon-clean:
-$(MAKE) -C $(LIBDAEMON_DIR) clean
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libdaemon
@ 2006-12-13 13:09 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2006-12-13 13:09 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-12-13 05:09:41 -0800 (Wed, 13 Dec 2006)
New Revision: 16895
Log:
stupid typo
Modified:
trunk/buildroot/package/libdaemon/libdaemon.mk
Changeset:
Modified: trunk/buildroot/package/libdaemon/libdaemon.mk
===================================================================
--- trunk/buildroot/package/libdaemon/libdaemon.mk 2006-12-13 13:07:47 UTC (rev 16894)
+++ trunk/buildroot/package/libdaemon/libdaemon.mk 2006-12-13 13:09:41 UTC (rev 16895)
@@ -28,7 +28,7 @@
touch $(LIBDAEMON_DIR)/.unpacked
$(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked
- (cd $(AVAHI_DIR) && rm -rf config.cache && autoconf)
+ (cd $(LIBDAEMON_DIR) && rm -rf config.cache && autoconf)
( \
cd $(LIBDAEMON_DIR) && \
$(TARGET_CONFIGURE_OPTS) \
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2008-08-27 7:29 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-27 7:29 [Buildroot] svn commit: trunk/buildroot/package/libdaemon jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-08-27 7:29 jacmet at uclibc.org
2008-07-04 9:48 ulf at uclibc.org
2008-04-24 13:16 ninevoltz at uclibc.org
2007-11-28 8:55 ulf at uclibc.org
2007-09-20 15:35 ulf at uclibc.org
2007-09-03 9:00 jacmet at uclibc.org
2007-09-03 8:56 jacmet at uclibc.org
2007-09-03 8:54 ` Ulf Samuelsson
2007-08-21 14:27 ulf at uclibc.org
2007-08-21 1:32 ulf at uclibc.org
2007-08-21 8:23 ` Bernhard Fischer
2007-08-21 14:15 ` Ulf Samuelsson
2007-07-17 12:06 ulf at uclibc.org
2007-01-22 18:15 andersen at uclibc.org
2006-12-13 13:09 andersen at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox