Import of InfoZIP

Peter Naulls peter at chocky.org
Tue Dec 18 13:40:17 PST 2001


In message <m3ellsr2in.fsf at nick.ws.noc.dsvr.net>
          Nick Burrett <nick at dsvr.net> wrote:

> OK. I've fixed a small Makefile issue for this.  So you should be
> able to configure thus:
> 
> ./configure  --prefix=/home/riscos/2.95/riscos-cross \
>         --with-riscos-dist=/home/riscos/2.95/!gcc \
>         --with-riscos-pkg=/home/riscos/2.95/riscos-pkg \
>         --enable-filetype-ff8
> 
> I can't guarantee that the exclamation marks within the !gcc path
> doesn't cause havoc with your shell interpretator though.  I've tested
> this with bash 2.04.

I don't think this is the most desirable, as it doesn't leave a place
for !System to end up, for any other apps we might eventually come up
with.


I suggest the follow patch.  In fact, you don't even need to use the
final /riscos-dist in this case.


Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/gccsdk/Makefile.in,v
retrieving revision 1.9.2.8
diff -u -r1.9.2.8 Makefile.in
--- Makefile.in	2001/09/12 12:50:31	1.9.2.8
+++ Makefile.in	2001/12/18 21:32:29
@@ -32,7 +32,8 @@
 ux_gccpkg=@prefix@
 
 # Installation directory of RISC OS binaries i.e. the stage 2 compiler.
-ro_gccpkg=@with_riscos_dist@
+ro_gccpkg=@with_riscos_dist@/!gcc
+ro_syspkg=@with_riscos_dist@/!System
 
 # Installation directory of RISC OS distribution packaged as zip files.
 ro_zippkg=@with_riscos_pkg@
@@ -100,7 +101,7 @@
 # Place variables in the environment.  This saves us having to pass
 # the variables to sub-makes on the command line.
 export TARGET_NAME objdir hostsystem targetsystem
-export ux_gccpkg ro_gccpkg ro_zippkg unix_prefix riscos_prefix
+export ux_gccpkg ro_gccpkg ro_syspkg ro_zippkg unix_prefix riscos_prefix
 export gn_standard_exec_prefix gn_standard_startfile_prefix
 export gn_gcc_include_dir gn_gplusplus_include_dir
 export gn_local_include_dir gn_system_include_dir gn_cross_include_dir
@@ -269,6 +271,8 @@
 	mkdir -p $(ro_gccpkg)/$(gn_gcc_bin_dir)/$(trg21)/o
 	mkdir -p $(ro_gccpkg)/$(gn_gcc_bin_dir)/$(trg30)/o
 	mkdir -p $(ro_gccpkg)/$(gn_gcc_bin_dir)/$(trg31)/o
+
+	mkdir -p @with_riscos_dist@/!System/Modules
 
 	mkdir -p $(info_dir)
 	mkdir -p $(objdir)
Index: riscos-dist/Makefile
===================================================================
RCS file: /usr/local/cvsroot/gccsdk/riscos-dist/Makefile,v
retrieving revision 1.4.2.5
diff -u -r1.4.2.5 Makefile
--- riscos-dist/Makefile	2001/12/18 15:00:21	1.4.2.5
+++ riscos-dist/Makefile	2001/12/18 21:32:29
@@ -86,6 +86,8 @@
 	$(bindir)/apcs26/unixlib/o/libiberty \
 	$(bindir)/apcs26/unixlib/o/libmp
 
+SYSTEMPKG = `basename $(ro_syspkg)`
+
 all:	install
 
 install:
@@ -111,6 +113,7 @@
 	rm -f $(ro_zippkg)/gpc.zip; \
 	rm -f $(ro_zippkg)/java.zip; \
 	rm -f $(ro_zippkg)/utils.zip; \
+	rm -f $(ro_zippkg)/system.zip; \
 	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/gcc.zip $(GCCPKG) ; \
 	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/gccdoc.zip $(GCCDOCPKG) ; \
 	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/cc1.zip $(CC1PKG) ; \
@@ -118,5 +121,6 @@
 	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/g77.zip $(G77PKG) ; \
 	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/gpc.zip $(GPCPKG) ; \
 	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/java.zip $(JAVAPKG) ; \
-	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/utils.zip $(UTILSPKG) ; )
+	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/utils.zip $(UTILSPKG) ; \
+	$(ux_bin_dir)/zip -, -9r $(ro_zippkg)/system.zip $(SYSTEMPKG) ; )
 
Index: unixlib/source/Makefile
===================================================================
RCS file: /usr/local/cvsroot/gccsdk/unixlib/source/Makefile,v
retrieving revision 1.4.2.8
diff -u -r1.4.2.8 Makefile
--- unixlib/source/Makefile	2001/09/13 14:22:29	1.4.2.8
+++ unixlib/source/Makefile	2001/12/18 21:32:32
@@ -201,6 +202,8 @@
 	$(libunixobj)/locale/strxfrm.o \
 	$(libunixobj)/locale/territory.o
 
+MODULE = $(libunixobj)/module/sharedunixlib.o
+
 NETLIB = $(libunixobj)/netlib/accept.o \
 	$(libunixobj)/netlib/bind.o \
 	$(libunixobj)/netlib/connect.o \
@@ -583,8 +586,11 @@
 ASM_OBJS = $(MATH_ASM) $(COMMON_ASM) $(GCCCOMPAT_ASM) $(NETLIB_ASM) \
 	$(SIGNAL_ASM) $(STDIO_ASM) $(SCL_ASM) $(SYS_ASM) $(TIME_ASM) \
 	$(UNIX_ASM)
+
+SUL = $(ro_syspkg)/Modules/SharedULib,ffa 
 
-all:	$(ux_gcc_bin_dir)/$(TRG)/unixlib.o $(ro_gcc_bin_dir)/$(TRG)/o/unixlib
+all:	$(ux_gcc_bin_dir)/$(TRG)/unixlib.o $(ro_gcc_bin_dir)/$(TRG)/o/unixlib \
+        $(SUL)
 
 install_headers:
 	$(insthdr) clib "*.h" unixlib $(ux_gccpkg)/$(gn_cross_include_dir) $(ro_gccpkg)/$(gn_cross_include_dir)
@@ -600,6 +606,9 @@
 
 $(ro_gcc_bin_dir)/$(TRG)/o/unixlib:	$(C_OBJS) $(ASM_OBJS)
 	$(CROSS_AR) $(CROSS_AR_FLAGS) $@ $(C_OBJS) $(ASM_OBJS)
+
+$(SUL):	$(MODULE)
+	$(CROSS_CC) $(MODULE) -Xlinker -module -o $@
 
 # Static dependencies:
 $(libunixobj)/abort.o: abort.c


-- 
------------------------------------------------------------------------
 Peter Naulls - peter at chocky.org
 RISC OS Projects Initiative  -  http://www.chocky.org/initiative/
 Java for RISC OS and ARM     -  http://www.chocky.org/java/
 Debian Linux on RiscPCs      -  http://www.chocky.org/debian/
------------------------------------------------------------------------



More information about the gcc mailing list