* [Buildroot] svn commit: trunk/buildroot/package/sed
@ 2006-11-03 8:21 andersen at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: andersen at uclibc.org @ 2006-11-03 8:21 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-11-03 00:21:47 -0800 (Fri, 03 Nov 2006)
New Revision: 16491
Log:
fix use of BUILD_WITH_LARGEFILE to properly
refer to BR2_LARGEFILE
Modified:
trunk/buildroot/package/sed/sed.mk
Changeset:
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk 2006-11-02 22:09:37 UTC (rev 16490)
+++ trunk/buildroot/package/sed/sed.mk 2006-11-03 08:21:47 UTC (rev 16491)
@@ -11,7 +11,7 @@
SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VER)
SED_BINARY:=sed/sed
SED_TARGET_BINARY:=bin/sed
-ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
+ifeq ($(strip $(BR2_LARGEFILE)),y)
SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
endif
#HOST_SED_DIR:=$(STAGING_DIR)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sed
@ 2007-03-09 8:36 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2007-03-09 8:36 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-09 00:36:22 -0800 (Fri, 09 Mar 2007)
New Revision: 18047
Log:
Include a patch for GNU sed that allows building it on Mac OS X and
remove a spurious --prefix from sed.mk. (Heikki Lindholm)
Added:
trunk/buildroot/package/sed/configure.patch
Modified:
trunk/buildroot/package/sed/sed.mk
Changeset:
Added: trunk/buildroot/package/sed/configure.patch
===================================================================
--- trunk/buildroot/package/sed/configure.patch (rev 0)
+++ trunk/buildroot/package/sed/configure.patch 2007-03-09 08:36:22 UTC (rev 18047)
@@ -0,0 +1,29 @@
+diff -Nru sed-4.1.5.orig/configure sed-4.1.5/configure
+--- sed-4.1.5.orig/configure 2006-02-03 11:24:40.000000000 +0200
++++ sed-4.1.5/configure 2007-02-23 14:03:55.000000000 +0200
+@@ -10147,8 +10147,6 @@
+ LINGUAS="${LINGUAS-%UNSET%}"
+
+
+- install_sh="$install_sh"
+-
+ _ACEOF
+
+
+@@ -11265,14 +11263,10 @@
+ esac
+ done ;;
+ gettext-fix )
+- sed -e '/^mkinstalldirs *=/a\' \
+- -e "install_sh=$install_sh" \
+- -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
++ sed -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
+ intl/Makefile > intl/Makefile.tmp
+ mv intl/Makefile.tmp intl/Makefile
+- sed -e '/^mkinstalldirs *=/a\' \
+- -e "install_sh=$install_sh" \
+- -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
++ sed -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
+ po/Makefile > po/Makefile.tmp
+ mv po/Makefile.tmp po/Makefile ;;
+ esac
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk 2007-03-09 08:33:34 UTC (rev 18046)
+++ trunk/buildroot/package/sed/sed.mk 2007-03-09 08:36:22 UTC (rev 18047)
@@ -18,6 +18,7 @@
HOST_SED_DIR:=$(TOOL_BUILD_DIR)
SED:=$(HOST_SED_DIR)/bin/sed -i -e
HOST_SED_TARGET=$(shell package/sed/sedcheck.sh)
+HOST_SED_IF_ANY=$(shell toolchain/dependencies/check-host-sed.sh)
$(DL_DIR)/$(SED_SOURCE):
mkdir -p $(DL_DIR)
@@ -35,13 +36,13 @@
mkdir -p $(TOOL_BUILD_DIR)
mkdir -p $(HOST_SED_DIR)/bin;
$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(SED_DIR1) package/sed/ configure.patch
touch $(SED_DIR1)/.unpacked
$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
(cd $(SED_DIR1); rm -rf config.cache; \
./configure \
--prefix=$(HOST_SED_DIR) \
- --prefix=/usr \
);
touch $(SED_DIR1)/.configured
@@ -62,17 +63,10 @@
$(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; fi
use-sed-host-binary:
- @if [ -x /usr/bin/sed ] ; then \
- SED="/usr/bin/sed" ; \
- else \
- if [ -x /bin/sed ] ; then \
- SED="/bin/sed" ; \
- fi \
- fi ; \
- if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \
+ @if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \
mkdir -p "$(HOST_SED_DIR)/bin"; \
rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
- ln -sf "$$SED" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
+ ln -sf "$(HOST_SED_IF_ANY)" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
fi
host-sed: $(HOST_SED_TARGET)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sed
@ 2007-07-17 12:12 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-07-17 12:12 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-17 05:12:12 -0700 (Tue, 17 Jul 2007)
New Revision: 19132
Log:
Avoid constant rebuild of 'sed'
Modified:
trunk/buildroot/package/sed/sed.mk
Changeset:
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk 2007-07-17 12:09:07 UTC (rev 19131)
+++ trunk/buildroot/package/sed/sed.mk 2007-07-17 12:12:12 UTC (rev 19132)
@@ -62,13 +62,16 @@
rm -rf $(HOST_SED_DIR)/share/locale $(HOST_SED_DIR)/usr/info \
$(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; fi
-use-sed-host-binary:
+$(HOST_SED_DIR)/$(SED_TARGET_BINARY):
if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \
mkdir -p "$(HOST_SED_DIR)/bin"; \
rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
ln -sf "$(HOST_SED_IF_ANY)" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
fi
+
+use-sed-host-binary: $(HOST_SED_DIR)/$(SED_TARGET_BINARY)
+
host-sed: $(HOST_SED_BINARY)
ifeq ($(HOST_SED_BINARY),build-sed-host-binary)
@@ -113,6 +116,8 @@
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
+ --include=$(STAGING_DIR)/include \
+ --include=$(STAGING_DIR)/usr/include \
$(DISABLE_NLS) \
);
touch $(SED_DIR2)/.configured
@@ -151,4 +156,4 @@
ifeq ($(strip $(BR2_PACKAGE_SED)),y)
TARGETS+=sed
endif
-.PHONY: sed host-sed
+.PHONY: sed host-sed use-sed-host-binary
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sed
@ 2007-08-12 18:14 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-08-12 18:14 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-12 11:14:49 -0700 (Sun, 12 Aug 2007)
New Revision: 19464
Log:
Move .PHONY to front in sed
Modified:
trunk/buildroot/package/sed/sed.mk
Changeset:
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk 2007-08-12 14:40:16 UTC (rev 19463)
+++ trunk/buildroot/package/sed/sed.mk 2007-08-12 18:14:49 UTC (rev 19464)
@@ -69,6 +69,7 @@
ln -sf "$(HOST_SED_IF_ANY)" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
fi
+.PHONY: sed host-sed use-sed-host-binary
use-sed-host-binary: $(HOST_SED_DIR)/$(SED_TARGET_BINARY)
@@ -155,4 +156,4 @@
ifeq ($(strip $(BR2_PACKAGE_SED)),y)
TARGETS+=sed
endif
-.PHONY: sed host-sed use-sed-host-binary
+
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sed
@ 2007-08-21 19:13 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2007-08-21 19:13 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-08-21 12:13:14 -0700 (Tue, 21 Aug 2007)
New Revision: 19626
Log:
- remove a superfluous semicolon
Modified:
trunk/buildroot/package/sed/sed.mk
Changeset:
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk 2007-08-21 18:30:54 UTC (rev 19625)
+++ trunk/buildroot/package/sed/sed.mk 2007-08-21 19:13:14 UTC (rev 19626)
@@ -34,7 +34,7 @@
#############################################################
$(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
mkdir -p $(TOOL_BUILD_DIR)
- mkdir -p $(HOST_SED_DIR)/bin;
+ mkdir -p $(HOST_SED_DIR)/bin
$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(SED_DIR1) package/sed/ configure.patch
touch $(SED_DIR1)/.unpacked
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sed
@ 2007-08-21 19:35 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2007-08-21 19:35 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-08-21 12:35:08 -0700 (Tue, 21 Aug 2007)
New Revision: 19629
Log:
- more cleanup (Cristian Ionescu-Idbohrn)
Modified:
trunk/buildroot/package/sed/sed.mk
Changeset:
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk 2007-08-21 19:33:00 UTC (rev 19628)
+++ trunk/buildroot/package/sed/sed.mk 2007-08-21 19:35:08 UTC (rev 19629)
@@ -37,33 +37,35 @@
mkdir -p $(HOST_SED_DIR)/bin
$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(SED_DIR1) package/sed/ configure.patch
- touch $(SED_DIR1)/.unpacked
+ touch $@
$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
(cd $(SED_DIR1); rm -rf config.cache; \
./configure \
--prefix=/usr \
)
- touch $(SED_DIR1)/.configured
+ touch $@
$(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured
$(MAKE) -C $(SED_DIR1)
# This stuff is needed to work around GNU make deficiencies
build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
- @if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ] ; then \
- rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); fi
+ @if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ]; then \
+ rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); \
+ fi
@if [ ! -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY) -o $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \
- -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \
+ -ot $(SED_DIR1)/$(SED_BINARY) ]; then \
set -x; \
mkdir -p $(HOST_SED_DIR)/bin; \
$(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) install; \
mv $(HOST_SED_DIR)/usr/bin/sed $(HOST_SED_DIR)/bin/; \
rm -rf $(HOST_SED_DIR)/share/locale $(HOST_SED_DIR)/usr/info \
- $(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; fi
+ $(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; \
+ fi
$(HOST_SED_DIR)/$(SED_TARGET_BINARY):
- if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \
+ if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ]; then \
mkdir -p "$(HOST_SED_DIR)/bin"; \
rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
ln -sf "$(HOST_SED_IF_ANY)" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
@@ -120,23 +122,25 @@
--include=$(STAGING_DIR)/usr/include \
$(DISABLE_NLS) \
)
- touch $(SED_DIR2)/.configured
+ touch $@
$(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(SED_DIR2)
# This stuff is needed to work around GNU make deficiencies
sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
- @if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \
- rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi
+ @if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ]; then \
+ rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); \
+ fi
@if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
- -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \
+ -ot $(SED_DIR2)/$(SED_BINARY) ]; then \
set -x; \
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \
mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
- $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi
+ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; \
+ fi
sed: uclibc sed-target_binary
@@ -156,4 +160,3 @@
ifeq ($(strip $(BR2_PACKAGE_SED)),y)
TARGETS+=sed
endif
-
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sed
@ 2008-03-06 18:24 ninevoltz at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:24 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:24:27 -0800 (Thu, 06 Mar 2008)
New Revision: 21227
Log:
cleanup sed makefile
Modified:
trunk/buildroot/package/sed/sed.mk
Changeset:
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk 2008-03-06 18:23:59 UTC (rev 21226)
+++ trunk/buildroot/package/sed/sed.mk 2008-03-06 18:24:27 UTC (rev 21227)
@@ -107,7 +107,7 @@
$(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(CONFIG_UPDATE) $(SED_DIR2)/config
- touch $(SED_DIR2)/.unpacked
+ touch $@
$(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
(cd $(SED_DIR2); rm -rf config.cache; \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sed
@ 2008-08-04 19:04 jacmet at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: jacmet at uclibc.org @ 2008-08-04 19:04 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-04 12:04:05 -0700 (Mon, 04 Aug 2008)
New Revision: 23013
Log:
sed: fix CPPFLAGS typo
Patch by Claus Klein.
Modified:
trunk/buildroot/package/sed/sed.mk
Changeset:
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk 2008-08-04 14:40:58 UTC (rev 23012)
+++ trunk/buildroot/package/sed/sed.mk 2008-08-04 19:04:05 UTC (rev 23013)
@@ -113,7 +113,7 @@
(cd $(SED_DIR2); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
- CPPFLAGS="$(SED_CFLAGS)" \
+ CPPFLAGS="$(SED_CPPFLAGS)" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-08-04 19:04 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-03 8:21 [Buildroot] svn commit: trunk/buildroot/package/sed andersen at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-03-09 8:36 aldot at uclibc.org
2007-07-17 12:12 ulf at uclibc.org
2007-08-12 18:14 ulf at uclibc.org
2007-08-21 19:13 aldot at uclibc.org
2007-08-21 19:35 aldot at uclibc.org
2008-03-06 18:24 ninevoltz at uclibc.org
2008-08-04 19:04 jacmet 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