From: Jan-Benedict G. <jb...@us...> - 2005-10-26 20:55:52
|
Update of /cvsroot/linux-vax/toolchain/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29593 Modified Files: uclibc-000011-new_Makefile.in-infrastructure.patch Log Message: - Don't yet delete our old Makefile. - The new build scheme isn't yet stable and won't build crt1.o now libcrypto. So for now, lets keep the old scheme and try to build with the new toy every now and then... Index: uclibc-000011-new_Makefile.in-infrastructure.patch =================================================================== RCS file: /cvsroot/linux-vax/toolchain/patches/uclibc-000011-new_Makefile.in-infrastructure.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- uclibc-000011-new_Makefile.in-infrastructure.patch 26 Oct 2005 10:49:48 -0000 1.1 +++ uclibc-000011-new_Makefile.in-infrastructure.patch 26 Oct 2005 20:55:42 -0000 1.2 @@ -10,111 +10,6 @@ for x in ${DIRS} ; do rm -f ${x}/Makefile -diff -Nurp src-uclibc-fresh/libc/sysdeps/linux/vax/Makefile src-uclibc-hacked/libc/sysdeps/linux/vax/Makefile ---- src-uclibc-fresh/libc/sysdeps/linux/vax/Makefile 2005-10-26 02:01:33.000000000 +0200 -+++ src-uclibc-hacked/libc/sysdeps/linux/vax/Makefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,101 +0,0 @@ --# Makefile for uClibc --# --# Copyright (C) 2001 by Lineo, inc. --# --# 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 --# --# Derived in part from the Linux-8086 C library, the GNU C Library, and several --# other sundry sources. Files within this library are copyright by their --# respective copyright holders. -- --TOPDIR=../../../../ --include $(TOPDIR)Rules.mak --ASFLAGS=$(CFLAGS) -- --CRT_SRC=crt1.S --CRT_OBJ=crt1.o --SCRT_OBJ=$(pathsubst %,S%, $(CRT_OBJ)) -- --#SSRC=longjmp.S setjmp.S vfork.S --SSRC=__longjmp.S setjmp.S _setjmp.S clone.S --#SSRC=_setjmp.S --SOBJS=$(patsubst %.S,%.o, $(SSRC)) --CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o -- --#CSRC=vfork.c _mmap.c __longjmp.c setjmp.c longjmp.c --CSRC=vfork.c _mmap.c brk.c --COBJS=$(patsubst %.c,%.o, $(CSRC)) -- --OBJS=$(SOBJS) $(COBJS) -- --OBJ_LIST=../../../obj.sysdeps.$(TARGET_ARCH) --all: $(OBJ_LIST) -- --$(OBJ_LIST): $(OBJS) $(CRT_OBJ) $(SCRT_OBJ) $(CTOR_TARGETS) -- echo $(patsubst %, sysdeps/linux/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) -- $(INSTALL) -d $(TOPDIR)lib/ -- cp $(CRT_OBJ) $(SCRT_OBJ) $(TOPDIR)lib/ -- --$(CRT_OBJ): $(CRT_SRC) -- $(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o -- $(STRIPTOOL) -x -R .note -R .comment $*.o -- --$(SCRT_OBJ): $(CRT_SRC) -- $(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o -- $(STRIPTOOL) -x -R .note -R .comment $*.o -- --$(LIBC): ar-target -- --ar-target: $(OBJS) $(CRT0_OBJ) -- $(AR) $(ARFLAGS) $(LIBC) $(OBJS) -- cp $(CRT0_OBJ) $(TOPDIR)lib -- --$(SOBJS): %.o : %.S -- $(CC) $(CFLAGS) -c $< -o $@ -- $(STRIPTOOL) -x -R .note -R .comment $*.o -- --$(COBJS): %.o : %.c -- $(CC) $(CFLAGS) -c $< -o $@ -- $(STRIPTOOL) -x -R .note -R .comment $*.o -- --ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) --crti.o: crti.S -- $(CC) $(ASFLAGS) -c crti.S -o crti.o -- --$(TOPDIR)lib/crti.o: crti.o -- $(INSTALL) -d $(TOPDIR)/lib/ -- cp crti.o $(TOPDIR)/lib/ -- --crtn.o: crtn.S -- $(CC) $(ASFLAGS) -c crtn.S -o crtn.o -- --$(TOPDIR)lib/crtn.o: crtn.o -- $(INSTALL) -d $(TOPDIR)/lib/ -- cp crtn.o $(TOPDIR)/lib/ --else --$(TOPDIR)lib/crti.o: -- $(INSTALL) -d $(TOPDIR)/lib/ -- $(AR) $(ARFLAGS) $(TOPDIR)/lib/crti.o -- --$(TOPDIR)lib/crtn.o: -- $(INSTALL) -d $(TOPDIR)lib/ -- $(AR) $(ARFLAGS) $(TOPDIR)lib/crtn.o --endif -- --headers: -- --clean: -- rm -f *.[oa] *~ core -- diff -Nurp src-uclibc-fresh/libc/sysdeps/linux/vax/Makefile.in src-uclibc-hacked/libc/sysdeps/linux/vax/Makefile.in --- src-uclibc-fresh/libc/sysdeps/linux/vax/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ src-uclibc-hacked/libc/sysdeps/linux/vax/Makefile.in 2005-10-26 02:11:23.000000000 +0200 |