Re: gcc-2.9.2-1
On Wed, Oct 27, 1999 at 02:04:09PM +0200, Matthias Klose wrote:
> Christopher C Chimelis writes:
> >
> > For Alpha, I ended up disabling pascal again and enabling garbage
> > collection for libobjc. It seems that with the new libgc packages, garbage
> > collection with libobjc works fine. Also, alpha doesn't seem to need or
> > want to install usr/lib/gcc-lib/alpha-linux/2.95.2/include/{asm,gnu}. I
> > saw that on i386, it installs asm/posix_types.h and gnu/types.h, but
> > apparently alpha doesn't need them.
>
> Appended is a patch (untested) to detect the existance of the files at
> install time.
Attached is the patch which let me build gcc 2.95.2-1 on powerpc. It
includes Matthias's patch to detect the asm and gnu dirs, which seems
to work perfectly; it also changes a few other things (see the
changelog). I changed the way in which stripping happens, to something
far more convenient when debugging in the tree (stripping instead of
using LDFLAGS=-s). Note that now libgcc.a is stripped (even before my
changes) - is that REALLY what we want to happen?
Dan
/--------------------------------\ /--------------------------------\
| Daniel Jacobowitz |__| SCS Class of 2002 |
| Debian GNU/Linux Developer __ Carnegie Mellon University |
| dan@debian.org | | dmj+@andrew.cmu.edu |
\--------------------------------/ \--------------------------------/
diff -ur o/gcc-2.95.2/debian/README.Debian gcc-2.95.2/debian/README.Debian
diff -ur o/gcc-2.95.2/debian/changelog gcc-2.95.2/debian/changelog
--- o/gcc-2.95.2/debian/changelog Sat Oct 30 12:38:35 1999
+++ gcc-2.95.2/debian/changelog Sat Oct 30 13:23:21 1999
@@ -1,3 +1,17 @@
+gcc (2.95.2-1.1) unstable; urgency=low
+
+ * Most of the powerpc patches have been applied upstream. Remove all
+ but ppc-ice, ppc-andrew-dwarf-eh, and ppc-descriptions.
+ * mulilib-install.dpatch was definitely a bad idea. Fix it properly
+ by using install -D.
+ * Also, don't make directories before installing any more. Simplifies
+ rules a (tiny) bit.
+ * Do not build with LDFLAGS=-s. Everything gets stripped out anyway by
+ dh_strip -a -X_debug; so leave the binaries in the build tree with
+ debugging symbols for simplified debugging of the packages.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sat, 30 Oct 1999 12:40:12 -0400
+
gcc (2.95.2-1) unstable; urgency=low
* gcc-2.95.2 release (taken from the CVS archive). -fstrict-aliasing
diff -ur o/gcc-2.95.2/debian/rules.defs gcc-2.95.2/debian/rules.defs
--- o/gcc-2.95.2/debian/rules.defs Sat Oct 30 12:38:36 1999
+++ gcc-2.95.2/debian/rules.defs Tue Oct 26 20:57:04 1999
@@ -43,9 +43,9 @@
# See, if the GNU pascal compiler is found
with_pascal := yes
# if pascal doesn't build on some target, disable it ...
-#ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),alpha arm m68k))
-# with_pascal := disabled for architecture $(DEB_HOST_ARCH)
-#endif
+ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),alpha powerpc))
+ with_pascal := disabled for architecture $(DEB_HOST_ARCH)
+endif
# disable the GNU pascal compiler by hand
#with_pascal := disabled by hand
diff -ur o/gcc-2.95.2/debian/rules.patch gcc-2.95.2/debian/rules.patch
--- o/gcc-2.95.2/debian/rules.patch Sat Oct 30 12:38:36 1999
+++ gcc-2.95.2/debian/rules.patch Tue Oct 26 20:58:04 1999
@@ -12,10 +12,10 @@
ifeq ($(SNAPSHOT),no)
debian_patches += bootstrap cpp-macro-doc \
- multilib-install gcc-default-arch \
+ gcc-default-arch \
libstdc++-out-of-mem libstdc++-valarray libstdc++-wall2 \
libstdc++-bastring gcc-manpage \
- cpp-dos-newlines g++-is-tree gcc-m68k-pic
+ cpp-dos-newlines g++-is-tree gcc-m68k-pic # multilib-install
#debian_patches += new-cpp # doesn't work
#debian_patches += objc-testsuite
debian_patches += arm-config
@@ -35,8 +35,8 @@
debian_patches += sparc32-rfi builtin-apply sparc-bi-arch
endif
ifeq ($(DEB_HOST_ARCH),powerpc)
- debian_patches += ppc-ice ppc-varargs ppc-descriptions \
- ppc-andrew-dwarf-eh ppc-no-weak-local-branches library-prefix
+ debian_patches += ppc-ice ppc-descriptions \
+ ppc-andrew-dwarf-eh
endif
endif
diff -ur o/gcc-2.95.2/debian/rules2 gcc-2.95.2/debian/rules2
--- o/gcc-2.95.2/debian/rules2 Sat Oct 30 12:38:36 1999
+++ gcc-2.95.2/debian/rules2 Sat Oct 30 17:21:15 1999
@@ -25,7 +25,7 @@
CPPFLAGS =
CFLAGS = $(CPPFLAGS)
CC = cc $(CPPFLAGS)
-LDFLAGS = -s
+LDFLAGS =
BOOT_CFLAGS = -g -O2 $(CPPFLAGS)
docdir = usr/share/doc
@@ -52,6 +52,7 @@
endif
LIBBUILDDIR = $(DEB_HOST_GNU_TYPE)
+gcc_lib_dir = $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)
ifneq ($(SNAPSHOT),yes)
with_check := no
@@ -332,38 +333,41 @@
lib \
$(docdir)/$(p_gcc) \
$(PF)/bin \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include \
+ $(gcc_lib_dir)/include \
$(PF)/share/man/man1
files_gcc = \
$(PF)/bin/{c89,gcc,egcc,gcov} \
$(PF)/share/man/man1/{c89,gcc,egcc,gcov}.1 \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/collect2 \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/{specs,cc1,libgcc.*,*.o} \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include/{asm,gnu,README,*.h}
+ $(gcc_lib_dir)/{collect2,specs,cc1,libgcc.*,*.o} \
+ $(gcc_lib_dir)/include/{README,*.h} \
+ $(shell test -e $(d)/$(gcc_lib_dir)/include/asm \
+ && echo $(gcc_lib_dir)/include/asm) \
+ $(shell test -e $(d)/$(gcc_lib_dir)/include/gnu \
+ && echo $(gcc_lib_dir)/include/gnu)
ifeq ($(with_proto),yes)
files_gcc += \
$(PF)/bin/{protoize,unprotoize} \
$(PF)/share/man/man1/{protoize,unprotoize}.1
endif
#files_gcc += \
-# $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/SYSCALLS.c.X
+# $(gcc_lib_dir)/SYSCALLS.c.X
ifeq ($(DEB_HOST_ARCH),powerpc)
dirs_nof = \
$(PF)/lib/nof \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/nof
+ $(gcc_lib_dir)/nof
files_nof = \
$(PF)/lib/nof \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/nof
+ $(gcc_lib_dir)/nof
endif
ifeq ($(DEB_HOST_ARCH),arm)
dirs_softfloat = \
$(PF)/lib/soft-float \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/soft-float
+ $(gcc_lib_dir)/soft-float
files_softfloat = \
$(PF)/lib/soft-float \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/soft-float
+ $(gcc_lib_dir)/soft-float
endif
dirs_cpp = \
@@ -372,7 +376,7 @@
$(PF)/bin
files_cpp = \
$(PF)/bin/cpp \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/cpp \
+ $(gcc_lib_dir)/cpp \
$(PF)/share/man/man1/cpp.1
ifneq ($(SNAPSHOT),yes)
dirs_cpp += lib
@@ -387,34 +391,33 @@
dirs_objc = \
$(docdir)/$(p_gcc) \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include
+ $(gcc_lib_dir)/include
files_objc = \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include/objc \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/{cc1obj,libobjc*.a}
+ $(gcc_lib_dir)/include/objc \
+ $(gcc_lib_dir)/{cc1obj,libobjc*.a}
dirs_gpp = \
$(docdir)/$(p_gpp) \
$(PF)/bin \
$(PF)/share/info \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include \
+ $(gcc_lib_dir)/include \
$(PF)/share/man/man1
files_gpp = \
$(PF)/bin/{c++,g++} \
$(PF)/share/man/man1/{c++,g++}.1 \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/cc1plus \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include/{new,typeinfo,exception} \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include/new.h
+ $(gcc_lib_dir)/cc1plus \
+ $(gcc_lib_dir)/include/{new,new.h,typeinfo,exception}
dirs_g77 = \
$(docdir)/$(p_g77) \
$(PF)/bin \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include \
+ $(gcc_lib_dir)/include \
$(PF)/include \
$(PF)/share/man/man1
files_g77 = \
$(PF)/bin/g77 \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/{f771,libg2c.a} \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/include/g2c.h \
+ $(gcc_lib_dir)/{f771,libg2c.a} \
+ $(gcc_lib_dir)/include/g2c.h \
$(PF)/share/man/man1/g77.1
dirs_g77d = \
@@ -426,34 +429,33 @@
dirs_chill = \
$(docdir)/$(p_gch) \
$(PF)/bin \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER) \
+ $(gcc_lib_dir) \
$(PF)/share/man/man1 \
$(PF)/share/info
files_chill = \
$(PF)/bin/chill \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/*chill* \
+ $(gcc_lib_dir)/*chill* \
$(PF)/share/info/chill*
dirs_java = \
$(docdir)/$(p_java) \
$(PF)/bin \
$(PF)/share/man/man1 \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)
+ $(gcc_lib_dir)
files_java = \
$(PF)/bin/{gcj,gcjh,jv-scan,jcf-dump} \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/jc1 \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/jvgenmain
+ $(gcc_lib_dir)/{jc1,jvgenmain}
dirs_gpc = \
$(docdir)/$(p_gpc) \
$(PF)/bin \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/{include,units} \
+ $(gcc_lib_dir)/{include,units} \
$(PF)/share/man/man1
files_gpc = \
$(PF)/bin/{bpc,epc,gpc,pc} \
$(PF)/share/man/man1/{bpc,epc,gpc,pc}.1 \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/{gpc-cpp,gpc1,libgpc.a,units}
+ $(gcc_lib_dir)/{gpc-cpp,gpc1,libgpc.a,units}
dirs_gpcd = \
$(docdir)/$(p_gpcd) \
@@ -472,7 +474,7 @@
$(docdir)/$(p_lgp) \
$(PF)/bin \
$(PF)/share/info \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER) \
+ $(gcc_lib_dir) \
$(PF)/share/man/man1 \
$(PF)/include/$(cxx_inc_dir)/gen
files_lgd = \
@@ -480,7 +482,7 @@
$(PF)/share/man/man1/genclass.1 \
$(PF)/share/info/libg++.info* \
$(addprefix $(PF)/lib/, $(lgp_arlib) $(lgp_marlink)) \
- $(PF)/lib/gcc-lib/$(DEB_HOST_GNU_TYPE)/$(VER)/libg++.{a,so} \
+ $(gcc_lib_dir)/libg++.{a,so} \
$(PF)/include/$(cxx_inc_dir)/gen/ \
$(PF)/include/$(cxx_inc_dir)/{$(shell cd $(srcdir)/libg++/src; \
echo *.h | tr ' ' ,)}
@@ -544,16 +546,17 @@
# $(PF)/include/$(cxx_inc_dir)/std, because libstdc++ doesn't check for g++-X/std
# $(PF)/include/$(cxx_inc_dir)/gen, because libg++ doesn't check for g++-X/gen
- mkdir -p $(d)/$(PF) \
- $(d)/$(PF)/share/doc \
- $(d)/$(PF)/include/$(cxx_inc_dir)/{gen,std}
+# Now that we use install -D again, none.
+# mkdir -p $(d)/$(PF) \
+# $(d)/$(PF)/share/doc \
+# $(d)/$(PF)/include/$(cxx_inc_dir)/{gen,std}
: # Install everything
ifneq ($(SNAPSHOT),yes)
PATH=$(PWD)/$(builddir)/texinfo/util:$$PATH \
$(MAKE) -C $(builddir) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
BOOT_CFLAGS="$(BOOT_CFLAGS)" \
- INSTALL="$(IR)" \
- INSTALL_PROGRAM="$(IP)" \
+ INSTALL="$(IR) -D" \
+ INSTALL_PROGRAM="$(IP) -D" \
prefix=$(PWD)/$(d)/$(PF) \
infodir=$(PWD)/$(d)/$(PF)/share/info \
mandir=$(PWD)/$(d)/$(PF)/share/man \
@@ -562,8 +565,8 @@
PATH=$(PWD)/$(builddir)/texinfo/util:$$PATH \
$(MAKE) -C $(builddir) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
BOOT_CFLAGS="$(BOOT_CFLAGS)" \
- INSTALL="$(IR)" \
- INSTALL_PROGRAM="$(IP)" \
+ INSTALL="$(IR) -D" \
+ INSTALL_PROGRAM="$(IP) -D" \
prefix=$(PWD)/$(d)/$(PF) \
infodir=$(PWD)/$(d)/$(PF)/share/info \
mandir=$(PWD)/$(d)/$(PF)/share/man install
Reply to: