--- Begin Message ---
Package: uclibc
Severity: important
Tags: patch
find uclibc-0.9.27
--- uclibc-0.9.27//debian/config 2006-03-11 23:26:21.000000000 +0100
+++ uclibc-0.9.27-1.my.0//debian/config 2006-03-11 15:38:45.000000000 +0100
@@ -141,8 +141,8 @@
# Library Installation Options
#
SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)lib"
-RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-uclibc-linux/"
-DEVEL_PREFIX="/usr/$(TARGET_ARCH)-uclibc-linux"
+RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/"
+DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
#
# uClibc development/debugging options
--- uclibc-0.9.27//debian/control 2006-03-11 23:26:21.000000000 +0100
+++ uclibc-0.9.27-1.my.0//debian/control 2006-03-13 00:16:17.000000000
+0100
@@ -7,7 +7,7 @@
Package: libuclibc-dev
Section: libdevel
-Architecture: alpha arm i386 m68k mips mipsel powerpc sh sparc
+Architecture: alpha arm arm-uclibc i386 i386-uclibc m68k mips mipsel
mipsel-uclibc powerpc sh sparc
Depends: libuclibc0 (= ${Source-Version})
Description: A small implementation of the C library
uClibc is an implementation of the standard C library that is
@@ -17,7 +17,7 @@
Package: libuclibc0
Section: libs
-Architecture: alpha arm i386 m68k mips mipsel powerpc sh sparc
+Architecture: alpha arm arm-uclibc i386 i386-uclibc m68k mips mipsel
mipsel-uclibc powerpc sh sparc
Depends:
Description: A small implementation of the C library
uClibc is an implementation of the standard C library that is
@@ -28,18 +28,18 @@
components for using uClibc as the primary library on a system,
as might be done for an embedded system.
-Package: uclibc-toolchain
+Package: uclibc-toolchain-mipsel-linux-uclibc
Section: devel
-Architecture: alpha arm i386 m68k mips mipsel powerpc sh sparc
-Depends: gcc|c-compiler, binutils, libuclibc-dev, ${shlibs:Depends}
-Conflicts: uclibc-gcc
-Replaces: uclibc-gcc
+Architecture: any
+Depends: gcc|c-compiler, binutils, libuclibc-dev-mipsel-uclibc-cross,
${shlibs:Depends}
+Conflicts: uclibc-mipsel-linux-uclibc-gcc
+Replaces: uclibc-mipsel-linux-uclibc-gcc
Description: A compiler wrapper for uClibc
This package includes utilities that function as a toolchain for
compiling with uClibc instead of the native libc. The utilities
have names such as powerpc-uclibc-gcc (depending on the architecture),
and should behave identically to the base utilities, except that
- they use headers and libraries provided in the libuclibc-dev
+ they use headers and libraries provided in the
libuclibc-dev-mipsel-linux-uclibc
package. Most utilities are symbolic links to the correct underlying
utility, although gcc and ld are implemented as wrapper binaries that
call gcc and ld with the necessary arguments and command line options.
--- uclibc-0.9.27//debian/rules 2006-03-11 23:26:21.000000000 +0100
+++ uclibc-0.9.27-1.my.0//debian/rules 2006-03-13 00:03:31.000000000 +0100
@@ -16,8 +16,19 @@
builddir=$(shell pwd)
DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-target=$(DEB_HOST_GNU_CPU)
-#target=arm
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+SHELL=/bin/bash
+debug=$(shell echo $($1) | tee >((echo -n '$1='; cat) > /dev/stderr) )
+DEB_HOST_ARCH_CPU:=$(call debug,DEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS:=$(call debug,DEB_HOST_ARCH_OS)
+
+target_cpu=$(DEB_HOST_GNU_CPU)
+target=$(DEB_HOST_ARCH_CPU)-$(DEB_HOST_ARCH_OS)
+crossarch=$(DEB_HOST_ARCH_CPU)-uclibc-cross
+gnu_target=$(DEB_HOST_GNU_CPU)-linux-gnu
with_shared_libs=y
#ifeq ($(target),powerpc)
@@ -30,23 +41,24 @@
shared_libs_true=false
endif
-ifneq ($(target),$(DEB_HOST_GNU_CPU))
+ifneq ($(target),$(DEB_BUILD_ARCH)-$(DEB_BUILD_ARCH_OS))
target_suffix=-$(target)
endif
-ifneq ($(target),$(DEB_HOST_GNU_CPU))
-cross_options = --cross="$(target)-linux-"
+ifneq ($(target),$(DEB_BUILD_ARCH)-$(DEB_BUILD_ARCH_OS))
+cross_options = --cross="$(target)-"
else
cross_options = --cross=""
endif
p_dev=libuclibc-dev$(target_suffix)
p_lib=libuclibc0$(target_suffix)
-p_gcc=uclibc$(target_suffix)-toolchain
+p_gcc=uclibc-toolchain$(target_suffix)
debian/control: debian/control.in debian/rules
- sed -e s/_TARGET_/$(target_suffix)/ \
- -e "s/_ARCHS_/alpha arm i386 m68k mips mipsel powerpc sh sparc/" \
+ sed -e "s,_TARGET_,$(target_suffix),g;\
+ s,_ARCHS_,alpha arm arm-uclibc i386 i386-uclibc m68k mips mipsel
mipsel-uclibc powerpc sh sparc,g;\
+ s,_CROSSARCH_,-$(crossarch),g" \
debian/control.in >debian/control
build: build-stamp
@@ -54,14 +66,19 @@
dh_testdir
mkdir -p kernel/include
- cp -ar /usr/include/linux /usr/include/asm /usr/include/asm-* \
+ifneq ($(target),$(DEB_BUILD_ARCH)-$(DEB_BUILD_ARCH_OS))
+ cp -ar /usr/$(DEB_HOST_GNU_CPU)-linux-gnu/include/*linux
/usr/$(DEB_HOST_GNU_CPU)-linux-gnu/include/asm
/usr/$(DEB_HOST_GNU_CPU)-linux-gnu/include/asm-* \
kernel/include
+else
+ cp -ar /usr/include/*linux /usr/include/asm /usr/include/asm-* \
+ kernel/include
+endif
grep -v 'typedef __u32 __kernel_dev_t' kernel/include/linux/types.h \
>types.h.tmp && mv types.h.tmp kernel/include/linux/types.h
cp debian/config .config
- echo TARGET_$(target)=y >>.config
- echo CONFIG_ARCH=$(target) >>.config
+ echo TARGET_$(target_cpu)=y >>.config
+ echo CONFIG_ARCH=$(target_cpu) >>.config
echo CONFIG_386=y >>.config
ifeq ($(findstring $(target),alpha m68k sparc),$(target))
echo BUILD_UCLIBC_LDSO=n >>.config
@@ -69,8 +86,8 @@
echo UCLIBC_PROFILING=n >>.config
echo SHARED_LIB_LOADER_PATH=\"/lib\" >>.config
echo KERNEL_SOURCE=\"$(builddir)/kernel\" >>.config
- echo 'RUNTIME_PREFIX="/usr/$(DEB_HOST_GNU_CPU)-uclibc-linux/"' >>.config
- echo 'DEVEL_PREFIX="/usr/$(DEB_HOST_GNU_CPU)-uclibc-linux"' >>.config
+ echo 'RUNTIME_PREFIX="/usr/"' >>.config
+ echo 'DEVEL_PREFIX="/usr/"' >>.config
echo 'DEVEL_TOOL_PREFIX="$$(DEVEL_PREFIX)"' >>.config
echo 'SYSTEM_DEVEL_PREFIX="/usr"' >>.config
@@ -85,7 +102,9 @@
touch build-stamp
-clean: debian/control
+clean: real-clean debian/control
+
+real-clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -104,7 +123,10 @@
dh_clean
-install: build debian/control
+ -rm debian/control
+
+
+install: build
dh_testdir
dh_testroot
dh_clean -k
@@ -119,40 +141,36 @@
$(MAKE) install_runtime PREFIX=`pwd`/debian/tmp
install -d debian/tmp/usr/bin/
- install -m755 debian/gcc-uClibc/$(target)-uclibc-ld \
- debian/tmp/usr/bin/$(target)-uclibc-linux-ld
- install -m755 debian/gcc-uClibc/$(target)-uclibc-gcc \
- debian/tmp/usr/bin/$(target)-uclibc-linux-gcc
+ install -m755 debian/gcc-uClibc/$(target)-ld \
+ debian/tmp/usr/bin/$(target)-ld
+ install -m755 debian/gcc-uClibc/$(target)-gcc \
+ debian/tmp/usr/bin/$(target)-gcc
install -d debian/tmp/usr/share/man/man1
install -m 644 debian/uclibc-gcc.1 \
- debian/tmp/usr/share/man/man1/$(target)-uclibc-linux-gcc.1
+ debian/tmp/usr/share/man/man1/$(target)-gcc.1
(cd debian/tmp/usr/share/man/man1; \
- ln -sf $(target)-uclibc-linux-gcc.1.gz
$(target)-uclibc-linux-cc.1.gz; \
- ln -sf $(target)-uclibc-linux-gcc.1.gz
$(target)-uclibc-linux-ld.1.gz; \
+ ln -sf $(gnu_target)-gcc.1.gz $(target)-cc.1.gz; \
+ ln -sf $(gnu_target)-gcc.1.gz $(target)-ld.1.gz; \
for x in addr2line ar as cpp nm objcopy objdump ranlib \
size strings strip;do \
- ln -sf $$x.1.gz $(target)-uclibc-linux-$$x.1.gz;done)
+ ln -sf $(gnu_target)-$$x.1.gz $(target)-$$x.1.gz;done)
(cd debian/tmp/usr/bin; \
for x in addr2line ar as cpp nm objcopy objdump ranlib \
size strings strip;do \
- ln -sf $$x $(target)-uclibc-linux-$$x;done)
- mkdir -p debian/tmp/usr/$(target)-uclibc-linux/bin
- (cd debian/tmp/usr/$(target)-uclibc-linux/bin; \
- for x in addr2line ar as cpp gcc cc nm objcopy objdump ranlib \
- size strings strip;do \
- ln -sf ../../bin/$(target)-uclibc-linux-$$x
$(target)-uclibc-linux-$$x;done)
+ ln -sf $(gnu_target)-$$x $(target)-$$x;done)
+ mkdir -p debian/tmp/usr/bin
install -d debian/tmp/usr/share/man/man1
install -m 644 debian/uclibc-ldd.1 \
- debian/tmp/usr/share/man/man1/$(target)-uclibc-linux-ldd.1
+ debian/tmp/usr/share/man/man1/$(target)-ldd.1
install -m 644 debian/uclibc-ldconfig.1 \
- debian/tmp/usr/share/man/man1/$(target)-uclibc-linux-ldconfig.1
+ debian/tmp/usr/share/man/man1/$(target)-ldconfig.1
install -m 644 debian/uclibc-readelf.1 \
- debian/tmp/usr/share/man/man1/$(target)-uclibc-linux-readelf.1
+ debian/tmp/usr/share/man/man1/$(target)-readelf.1
mkdir debian/tmp/lib/
- cd debian/tmp/lib && ln -sf
/usr/$(target)-uclibc-linux/lib/ld-uClibc.so.0 .
+ #cd debian/tmp/lib && ln -sf /usr/$(target)/lib/ld-uClibc.so.0 .
cd debian/tmp && perl ../fixlinks
@@ -166,6 +184,9 @@
# dh_testversion
dh_testdir
dh_testroot
+ifneq ($(target),$(DEB_BUILD_ARCH)-$(DEB_BUILD_ARCH_OS))
+ cp debian/uclibc-toolchain.files
debian/uclibc-toolchain$(target_suffix).files
+endif
dh_movefiles
# dh_installdebconf
@@ -196,6 +217,14 @@
#endif
dh_gencontrol
dh_md5sums
+ mv debian/uclibc-toolchain$(target_suffix)/DEBIAN/control{,.old}
+ sed -e 's,.*\(Architecture:\).*,\1 $(DEB_BUILD_ARCH_CPU),g'\
+ < debian/uclibc-toolchain$(target_suffix)/DEBIAN/control.old\
+ > debian/uclibc-toolchain$(target_suffix)/DEBIAN/control
+ mv debian/files{,.old}
+ sed -e
's,\(uclibc-toolchain.*\)$(DEB_HOST_ARCH).deb,\1$(DEB_BUILD_ARCH_CPU).deb,g'\
+ < debian/files.old\
+ > debian/files
dh_builddeb
binary: binary-indep binary-arch
--- uclibc-0.9.27//debian/gcc-uClibc/Makefile 2006-03-11 23:26:21.000000000
+0100
+++ uclibc-0.9.27-1.my.0//debian/gcc-uClibc/Makefile 2006-03-12
00:40:04.000000000 +0100
@@ -10,8 +10,15 @@
CC := gcc-3.3
UCLIBC_DIR := $(shell (cd $(TOPDIR); /bin/pwd))
-GCC_BIN := $(shell which $(CC))
-LD_BIN := $(shell which $(LD))
+GCC_BIN := $(DEB_HOST_GNU_CPU)-linux-gnu-gcc
+ifeq ($(shell which $(GCC_BIN) || echo no),no)
+GCC_BIN := gcc
+endif
+LD_BIN := $(DEB_HOST_GNU_CPU)-linux-gnu-ld
+ifeq ($(shell which $(LD_BIN) || echo no),no)
+LD_BIN := ld
+endif
+
GCCINCDIR := $(shell $(CC) -print-search-dirs | sed -ne "s/install:
\(.*\)/\1include/gp")
ifeq ($(HAVE_SHARED),y)
@@ -24,13 +31,13 @@
DYNAMIC_LINKER:=/lib/$(strip $(subst ",, $(notdir $(SYSTEM_LDSO))))
endif
endif
-
-all: $(DEB_HOST_GNU_CPU)-uclibc-gcc $(DEB_HOST_GNU_CPU)-uclibc-ld
+pref=$(DEB_HOST_ARCH_CPU)-$(DEB_HOST_ARCH_OS)
+all: $(pref)-gcc $(pref)-ld
gcc-uClibc.h: Makefile $(TOPDIR)/.config
@echo "/* this file was autogenerated by make */" > $@
@echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >> $@
- @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> $@
+ @echo "#define UCLIBC_DEVEL_PREFIX
"\"$(DEVEL_PREFIX)$(DEB_HOST_GNU_TYPE)/\" >> $@
@echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> $@
@echo "#define GCC_BIN " \"$(GCC_BIN)\" >> $@
@echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> $@
@@ -63,37 +70,36 @@
@echo "#undef __UCLIBC_CTOR_DTOR__" >> $@
endif
-$(DEB_HOST_GNU_CPU)-uclibc-gcc: gcc-uClibc.c gcc-uClibc.h
+$(pref)-gcc: gcc-uClibc.c gcc-uClibc.h
$(HOSTCC) $(HOSTCFLAGS) -s $< -o $@
-$(DEB_HOST_GNU_CPU)-uclibc-ld: Makefile $(TOPDIR)/.config
+$(pref)-ld: Makefile $(TOPDIR)/.config
@echo "#!/bin/sh" > $@
@echo "# This file was autogenerated by make" >> $@
- @echo "exec $(LD_BIN) \"[EMAIL PROTECTED]" -L$(DEVEL_PREFIX)usr/lib " \
- "-L$(DEVEL_PREFIX)lib -L$(UCLIBC_DIR)" >> $@
+ @echo "exec $(LD_BIN) \"[EMAIL PROTECTED]"
-L$(DEVEL_PREFIX)$(DEB_HOST_GNU_TYPE)/lib" >> $@
chmod a+x $@
install: all
$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)usr/bin
$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)bin
- $(INSTALL) -m 755 $(DEB_HOST_GNU_CPU)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)bin/
- $(INSTALL) -m 755 $(DEB_HOST_GNU_CPU)-uclibc-ld
$(PREFIX)$(DEVEL_PREFIX)bin/
- $(LN) -fs $(DEB_HOST_GNU_CPU)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-cc
- $(LN) -fs $(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)usr/bin/gcc
- $(LN) -fs $(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)usr/bin/cc
- $(LN) -fs $(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-ld
$(PREFIX)$(DEVEL_PREFIX)usr/bin/ld
+ $(INSTALL) -m 755 $(pref)-gcc $(PREFIX)$(DEVEL_PREFIX)bin/
+ $(INSTALL) -m 755 $(pref)-ld $(PREFIX)$(DEVEL_PREFIX)bin/
+ $(LN) -fs $(pref)-gcc $(PREFIX)$(DEVEL_PREFIX)bin/$(pref)-cc
+ $(LN) -fs $(DEVEL_PREFIX)bin/$(pref)-gcc
$(PREFIX)$(DEVEL_PREFIX)usr/bin/gcc
+ $(LN) -fs $(DEVEL_PREFIX)bin/$(pref)-gcc
$(PREFIX)$(DEVEL_PREFIX)usr/bin/cc
+ $(LN) -fs $(DEVEL_PREFIX)bin/$(pref)-ld
$(PREFIX)$(DEVEL_PREFIX)usr/bin/ld
ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
- $(LN) -fs $(DEB_HOST_GNU_CPU)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-g++
- $(LN) -fs $(DEB_HOST_GNU_CPU)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-c++
- $(LN) -fs $(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)usr/bin/c++
- $(LN) -fs $(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-gcc
$(PREFIX)$(DEVEL_PREFIX)usr/bin/g++
+ $(LN) -fs $(pref)-gcc $(PREFIX)$(DEVEL_PREFIX)bin/$(pref)-g++
+ $(LN) -fs $(pref)-gcc $(PREFIX)$(DEVEL_PREFIX)bin/$(pref)-c++
+ $(LN) -fs $(DEVEL_PREFIX)bin/$(pref)-gcc
$(PREFIX)$(DEVEL_PREFIX)usr/bin/c++
+ $(LN) -fs $(DEVEL_PREFIX)bin/$(pref)-gcc
$(PREFIX)$(DEVEL_PREFIX)usr/bin/g++
endif
for app in addr2line ar as cpp gasp nm objcopy \
objdump ranlib size strings strip; do \
APPNAME=`which $(CROSS)$${app} 2>/dev/null`; \
if [ -x "$$APPNAME" ] ; then \
$(LN) -fs "$$APPNAME" $(PREFIX)$(DEVEL_PREFIX)usr/bin/$${app}; \
- $(LN) -fs "$$APPNAME"
$(PREFIX)$(DEVEL_PREFIX)bin/$(DEB_HOST_GNU_CPU)-uclibc-$${app}; \
+ $(LN) -fs "$$APPNAME" $(PREFIX)$(DEVEL_PREFIX)bin/$(pref)-$${app}; \
fi; \
done
--- uclibc-0.9.27//debian/control.in 2006-03-11 23:26:21.000000000 +0100
+++ uclibc-0.9.27-1.my.0//debian/control.in 2006-03-13 00:02:39.000000000
+0100
@@ -5,17 +5,17 @@
Build-Depends: debhelper, bzip2
Standards-Version: 3.5.8
-Package: libuclibc-dev_TARGET_
+Package: libuclibc-dev
Section: libdevel
Architecture: _ARCHS_
-Depends: libuclibc0_TARGET_ (= ${Source-Version})
+Depends: libuclibc0 (= ${Source-Version})
Description: A small implementation of the C library
uClibc is an implementation of the standard C library that is
much smaller than glibc, which makes it useful for embedded
systems. This package includes header files and development
libraries necessary to compile applications that use uClibc.
-Package: libuclibc0_TARGET_
+Package: libuclibc0
Section: libs
Architecture: _ARCHS_
Depends:
@@ -28,10 +28,10 @@
components for using uClibc as the primary library on a system,
as might be done for an embedded system.
-Package: uclibc_TARGET_-toolchain
+Package: uclibc-toolchain_TARGET_
Section: devel
-Architecture: _ARCHS_
-Depends: gcc|c-compiler, binutils, libuclibc-dev_TARGET_, ${shlibs:Depends}
+Architecture: any
+Depends: gcc|c-compiler, binutils, libuclibc-dev_CROSSARCH_, ${shlibs:Depends}
Conflicts: uclibc_TARGET_-gcc
Replaces: uclibc_TARGET_-gcc
Description: A compiler wrapper for uClibc
--- uclibc-0.9.27//debian/libuclibc-dev.files 2006-03-11 23:26:21.000000000
+0100
+++ uclibc-0.9.27-1.my.0//debian/libuclibc-dev.files 2005-07-22
00:46:28.000000000 +0200
@@ -1,12 +1,11 @@
-usr/*-uclibc-linux/include
-usr/*-uclibc-linux/lib/*.a
-usr/*-uclibc-linux/lib/libcrypt.so
-usr/*-uclibc-linux/lib/libdl.so
-usr/*-uclibc-linux/lib/libintl.so
-usr/*-uclibc-linux/lib/libm.so
-usr/*-uclibc-linux/lib/libnsl.so
-usr/*-uclibc-linux/lib/libpthread.so
-usr/*-uclibc-linux/lib/libresolv.so
-usr/*-uclibc-linux/lib/libc.so
-usr/*-uclibc-linux/lib/libutil.so
-usr/*-uclibc-linux/lib/*.o
+usr/include
+usr/lib/*.a
+usr/lib/libcrypt.so
+usr/lib/libdl.so
+usr/lib/libm.so
+usr/lib/libnsl.so
+usr/lib/libpthread.so
+usr/lib/libresolv.so
+usr/lib/libc.so
+usr/lib/libutil.so
+usr/lib/*.o
--- uclibc-0.9.27//debian/libuclibc0.files 2006-03-11 23:26:21.000000000
+0100
+++ uclibc-0.9.27-1.my.0//debian/libuclibc0.files 2005-07-22
00:43:32.000000000 +0200
@@ -1,3 +1,2 @@
-lib/*
-usr/*-uclibc-linux/lib/*.so.*
-usr/*-uclibc-linux/lib/*-*.so
+usr/lib/*.so.*
+usr/lib/*-*.so
--- uclibc-0.9.27//debian/uclibc-toolchain.files 2006-03-11
23:26:21.000000000 +0100
+++ uclibc-0.9.27-1.my.0//debian/uclibc-toolchain.files 2005-07-22
00:44:10.000000000 +0200
@@ -1,3 +1,2 @@
-usr/*-uclibc-linux/bin/*
usr/bin/*
usr/share/man/man1/*
--- uclibc-0.9.27//extra/scripts/fix_includes.sh 2006-03-11
23:26:21.000000000 +0100
+++ uclibc-0.9.27-1.my.0//extra/scripts/fix_includes.sh 2006-03-11
15:48:42.000000000 +0100
@@ -165,6 +165,11 @@
set -x;
ln -fs $KERNEL_SOURCE/include/asm-cris include/asm;
set +x;
+ elif [ "$TARGET_ARCH" = "i386" ]; then
+ set -x;
+ ln -fs $KERNEL_SOURCE/include/asm-i386 include/;
+ ln -fs $KERNEL_SOURCE/include/asm-i486 include/;
+ set +x;
elif [ "$HAS_MMU" != "y" ]; then
if [ -d $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu ] ; then
set -x;
@@ -183,8 +188,13 @@
else
# No guessing required.....
ln -fs $KERNEL_SOURCE/include/asm include/asm
+[ -d $KERNEL_SOURCE/include/asm-$TARGET_ARCH ] && ln -fs
$KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm-$TARGET_ARCH
fi;
+if [ "$TARGET_ARCH" = "i386" ]; then
+ ln -fs $KERNEL_SOURCE/include/asm-i486 include/
+fi
+
if [ "$TARGET_ARCH" = "sparc" ]; then
ln -fs $KERNEL_SOURCE/include/asm-sparc include/asm-sparc
fi
@@ -197,5 +207,5 @@
# Create the include/linux symlink.
rm -f include/linux
-ln -fs $KERNEL_SOURCE/include/linux include/linux
+ln -fs $KERNEL_SOURCE/include/*linux include/
--- uclibc-0.9.27//ldso/ldso/ldso.c 2005-01-12 08:59:21.000000000 +0100
+++ uclibc-0.9.27-1.my.0//ldso/ldso/ldso.c 2006-03-11 15:50:28.000000000
+0100
@@ -71,8 +71,8 @@
{
}
-static unsigned char *_dl_malloc_addr = 0; /* Lets _dl_malloc use the
already allocated memory page */
-static unsigned char *_dl_mmap_zero = 0; /* Also used by _dl_malloc */
+unsigned char *_dl_malloc_addr = 0; /* Lets _dl_malloc use the already
allocated memory page */
+unsigned char *_dl_mmap_zero = 0; /* Also used by _dl_malloc */
#if defined (__SUPPORT_LD_DEBUG__)
static void debug_fini (int status, void *arg)
--- uclibc-0.9.27//libc/stdlib/malloc-standard/free.c 2005-01-12
08:59:21.000000000 +0100
+++ uclibc-0.9.27-1.my.0//libc/stdlib/malloc-standard/free.c 2006-03-11
15:54:13.000000000 +0100
@@ -41,6 +41,8 @@
On systems that do not support "negative sbrks", it will always
return 0.
*/
+static int __malloc_trim(size_t pad, mstate av);
+
int malloc_trim(size_t pad)
{
mstate av = get_malloc_state();
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.13-rc3
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
--- End Message ---
