gcc-2.9.2-1
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.
--- debian/rules2~ Thu Oct 21 16:09:50 1999
+++ debian/rules2 Wed Oct 27 13:38:26 1999
@@ -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 ' ' ,)}
Reply to: