Browse Source
git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20585 10447126-35f2-4685-b0cf-6dd780d3921fearly
Alejandro Mery
18 years ago
10 changed files with 136 additions and 194 deletions
@ -1,71 +0,0 @@
|
||||
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# T2 SDE: package/.../embutils/build.patch
|
||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- T2-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Remove some unusal build system stuff, so that we can build it normally,
|
||||
linked against any libc ...
|
||||
|
||||
- Rene Rebe <rene@exactcode.de>
|
||||
|
||||
--- embutils-0.17/Makefile 2005-01-31 19:06:38.000000000 +0100
|
||||
+++ embutils-0.17-patched/Makefile 2005-02-02 12:54:27.383231704 +0100
|
||||
@@ -1,9 +1,7 @@
|
||||
INSTALL=install
|
||||
-prefix=/opt/diet
|
||||
+prefix=/usr
|
||||
# Set the following to install to a different root
|
||||
#DESTDIR=/tmp/fefix
|
||||
-# Set the following to use the diet libc
|
||||
-DIET=diet -Os
|
||||
|
||||
FLAGS=
|
||||
|
||||
@@ -15,30 +13,26 @@
|
||||
truncate strings test date mount printenv umount pivot_root insmod rmmod \
|
||||
lsmod
|
||||
|
||||
-ARCH:=$(shell uname -m | sed 's/i[4-9]86/i386/')
|
||||
-
|
||||
-OBJDIR:=bin-$(ARCH)
|
||||
+OBJDIR:=bin
|
||||
TARGETS=$(patsubst %,$(OBJDIR)/%,$(PRGS))
|
||||
|
||||
all: $(OBJDIR) $(TARGETS)
|
||||
|
||||
CFLAGS=-pipe -Os -fomit-frame-pointer
|
||||
|
||||
-CROSS=
|
||||
-
|
||||
#CFLAGS=-pipe -g
|
||||
|
||||
|
||||
$(OBJDIR)/%.o: %.c
|
||||
- $(DIET) $(CROSS)gcc $(CFLAGS) $(FLAGS) -c $< -o $@
|
||||
- $(CROSS)strip -x -R .comment -R .note $@
|
||||
+ $(CC) $(CFLAGS) $(FLAGS) -c $< -o $@
|
||||
+ $(STRIP) -x -R .comment -R .note $@
|
||||
|
||||
$(OBJDIR)/%.o: %.S
|
||||
- $(DIET) $(CROSS)gcc -pipe -c $< -o $@
|
||||
+ $(CC) -pipe -c $< -o $@
|
||||
|
||||
$(OBJDIR)/%: $(OBJDIR)/%.o
|
||||
- $(DIET) $(CROSS)gcc -o $@ $^
|
||||
- $(CROSS)strip -R .note -R .comment $@
|
||||
+ $(CC) -o $@ $^
|
||||
+ $(STRIP) -R .note -R .comment $@
|
||||
|
||||
$(OBJDIR)/uniq: $(OBJDIR)/uniq.o $(OBJDIR)/fmt_ulongpadright.o $(OBJDIR)/fmt_ulong.o
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# T2 SDE: package/.../embutils/no-shared.patch
|
||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- T2-COPYRIGHT-NOTE-END ---
|
||||
|
||||
We later might like to disable more.
|
||||
|
||||
- Rene Rebe <rene@exactcode.de>
|
||||
|
||||
--- embutils-0.17-patched/Makefile.orig 2005-02-02 13:12:10.851559944 +0100
|
||||
+++ embutils-0.17-patched/Makefile 2005-02-02 13:12:15.720819704 +0100
|
||||
@@ -10,7 +10,7 @@
|
||||
dirname domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head \
|
||||
install sosrm soscp sosmv sosln soslns md5sum sleep2 allinone kill uniq \
|
||||
dd tr mesg write touch du tail uuencode uudecode nohup nice cmp mktemp \
|
||||
-truncate strings test date mount printenv umount pivot_root insmod rmmod \
|
||||
+truncate test date mount printenv umount pivot_root insmod rmmod \
|
||||
lsmod free losetup
|
||||
|
||||
OBJDIR:=bin
|
||||
@ -0,0 +1,63 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../embutils/parallelism.patch
|
||||
# Copyright (C) 2007 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
--- ./Makefile.orig 2006-08-03 06:54:04.000000000 -0400
|
||||
+++ ./Makefile 2007-03-28 00:21:50.000000000 -0400
|
||||
@@ -33,13 +33,11 @@
|
||||
|
||||
#CFLAGS=-pipe -g
|
||||
|
||||
-$(OBJDIR)/%.o: %.c
|
||||
- @test -d $(OBJDIR) || mkdir $(OBJDIR)
|
||||
+$(OBJDIR)/%.o: %.c $(OBJDIR)
|
||||
$(DIET) $(CROSS)gcc $(CFLAGS) $(FLAGS) -c $< -o $@
|
||||
$(CROSS)strip -x -R .comment -R .note $@
|
||||
|
||||
$(OBJDIR)/%.o: %.S $(OBJDIR)
|
||||
- @test -d $(OBJDIR) || mkdir $(OBJDIR)
|
||||
$(DIET) $(CROSS)gcc -pipe -c $< -o $@
|
||||
|
||||
$(OBJDIR)/%: $(OBJDIR)/%.o
|
||||
@@ -51,13 +49,13 @@
|
||||
$(OBJDIR)/renice: $(OBJDIR)/renice.o $(OBJDIR)/fmt_long.o $(OBJDIR)/fmt_ulong.o
|
||||
|
||||
$(OBJDIR)/cp: $(OBJDIR)/mv
|
||||
- ln -s mv $@
|
||||
+ ln -sf mv $@
|
||||
|
||||
$(OBJDIR)/chgrp: $(OBJDIR)/chown
|
||||
- -ln -s chown $@
|
||||
+ ln -sf chown $@
|
||||
|
||||
$(OBJDIR)/mkfifo: $(OBJDIR)/mknod
|
||||
- ln -s mknod $@
|
||||
+ ln -sf mknod $@
|
||||
|
||||
$(OBJDIR)/mknod.o $(OBJDIR)/mkdir.o: error.c parsemode.c
|
||||
|
||||
@@ -100,9 +98,9 @@
|
||||
install: $(TARGETS)
|
||||
test -d $(DESTDIR)$(prefix)/bin || mkdir -p $(DESTDIR)$(prefix)/bin
|
||||
$(INSTALL) $(TARGETS) $(DESTDIR)$(prefix)/bin
|
||||
- -ln -f $(DESTDIR)$(prefix)/bin/chown $(DESTDIR)$(prefix)/bin/chgrp
|
||||
- -ln -f $(DESTDIR)$(prefix)/bin/mv $(DESTDIR)$(prefix)/bin/cp
|
||||
- -ln -f $(DESTDIR)$(prefix)/bin/mknod $(DESTDIR)$(prefix)/bin/mkfifo
|
||||
+ -ln -sf chown $(DESTDIR)$(prefix)/bin/chgrp
|
||||
+ -ln -sf mv $(DESTDIR)$(prefix)/bin/cp
|
||||
+ -ln -sf mknod $(DESTDIR)$(prefix)/bin/mkfifo
|
||||
|
||||
uninstall:
|
||||
rm -f $(patsubst %,$(DESTDIR)$(prefix)/bin/%,$(PRGS))
|
||||
@ -1,31 +0,0 @@
|
||||
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# T2 SDE: package/.../embutils/which-wd.patch
|
||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- T2-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Fixed which to inject a . when nothing is found between colons, so current
|
||||
working directory binaries are located.
|
||||
|
||||
- Rene Rebe <rene@exactcode.de>
|
||||
|
||||
--- embutils-0.17/which.c 2002-05-27 17:23:26.000000000 +0200
|
||||
+++ embutils-0.17-free/which.c 2005-02-14 17:08:41.453217816 +0100
|
||||
@@ -32,6 +32,7 @@
|
||||
struct stat ss;
|
||||
char *bar=(char*)alloca(strlen(tmp)+strlen(argv[i])+5);
|
||||
int len=str_copy(bar,tmp);
|
||||
+ if (len==0) { *bar='.'; len++; }
|
||||
bar[len]='/'; ++len;
|
||||
len+=str_copy(bar+len,argv[i]);
|
||||
bar[len]=0;
|
||||
Loading…
Reference in new issue