[rtems-libbsd commit] Makefile: sparc/sis builds again

Joel Sherrill joel at rtems.org
Sat Jul 14 19:01:23 UTC 2012


Module:    rtems-libbsd
Branch:    master
Commit:    a30cd8ca65a6e2e67d6a2a37dcedd0784607159e
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=a30cd8ca65a6e2e67d6a2a37dcedd0784607159e

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Sat Jul 14 14:02:44 2012 -0500

Makefile: sparc/sis builds again

  + sparc did not really have a unique in_cksum.c and Makefile
    needed to be adjusted to reflect this
  + some destination directories for copied files did not exist.
    make the destination directory before copying.
    This is really not a great thing to do as it messes with the source
    tree but it works for now. It would be better to make a special
    place to put generated source and integrate that into the build system.

---

 Makefile            |   12 +++++++++++-
 freebsd-to-rtems.py |    3 +--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3bba92f..8f8a372 100644
--- a/Makefile
+++ b/Makefile
@@ -609,66 +609,77 @@ lib_user: $(LIB) install_bsd
 
 # The following targets use the MIPS Generic in_cksum routine
 rtemsbsd/avr/avr/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/avr/avr|| mkdir -p rtemsbsd/avr/avr
 	cp $< $@
 
 rtemsbsd/avr/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/bfin/bfin/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/bfin/bfin|| mkdir -p rtemsbsd/bfin/bfin
 	cp $< $@
 
 rtemsbsd/bfin/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/h8300/h8300/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/h8300/h8300|| mkdir -p rtemsbsd/h8300/h8300
 	cp $< $@
 
 rtemsbsd/h8300/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/lm32/lm32/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/lm32/lm32|| mkdir -p rtemsbsd/lm32/lm32
 	cp $< $@
 
 rtemsbsd/lm32/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/m32c/m32c/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/m32c/m32c|| mkdir -p rtemsbsd/m32c/m32c
 	cp $< $@
 
 rtemsbsd/m32c/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/m32r/m32r/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/m32r/m32r|| mkdir -p rtemsbsd/m32r/m32r
 	cp $< $@
 
 rtemsbsd/m32r/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/m68k/m68k/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/m68k/m68k|| mkdir -p rtemsbsd/m68k/m68k
 	cp $< $@
 
 rtemsbsd/m68k/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/nios2/nios2/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/nios2/nios2|| mkdir -p rtemsbsd/nios2/nios2
 	cp $< $@
 
 rtemsbsd/nios2/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/sh/sh/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/sh/sh|| mkdir -p rtemsbsd/sh/sh
 	cp $< $@
 
 rtemsbsd/sh/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/sparc/sparc/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/sparc/sparc|| mkdir -p rtemsbsd/sparc/sparc
 	cp $< $@
 
 rtemsbsd/sparc/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
 	cp $< $@
 
 rtemsbsd/v850/v850/in_cksum.c: freebsd/mips/mips/in_cksum.c
+	test -d rtemsbsd/v850/v850|| mkdir -p rtemsbsd/v850/v850
 	cp $< $@
 
 rtemsbsd/v850/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h
@@ -769,7 +780,6 @@ CPU_SED += -e '/arm/d'
 CPU_SED += -e '/i386/d'
 CPU_SED += -e '/powerpc/d'
 CPU_SED += -e '/mips/d'
-CPU_SED += -e '/sparc/d'
 CPU_SED += -e '/sparc64/d'
 
 install: $(LIB) install_bsd lib_user install_user
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index 25f8c9b..307c52f 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -427,6 +427,7 @@ class ModuleManager:
 			'# The following targets use the MIPS Generic in_cksum routine\n'
 		for cpu in CPUsNeedingGenericIncksum:
 			data += 'rtemsbsd/' + cpu + '/' + cpu + '/in_cksum.c: freebsd/mips/mips/in_cksum.c\n' \
+				'\ttest -d rtemsbsd/' + cpu + '/' + cpu + '|| mkdir -p rtemsbsd/' + cpu + '/' + cpu + '\n' \
 				'\tcp $< $@\n' \
 				'\n' \
 				'rtemsbsd/' + cpu + '/include/freebsd/machine/in_cksum.h: freebsd/mips/include/freebsd/machine/in_cksum.h\n' \
@@ -445,7 +446,6 @@ class ModuleManager:
 			'CPU_SED += -e \'/i386/d\'\n' \
 			'CPU_SED += -e \'/powerpc/d\'\n' \
 			'CPU_SED += -e \'/mips/d\'\n' \
-			'CPU_SED += -e \'/sparc/d\'\n' \
 			'CPU_SED += -e \'/sparc64/d\'\n' \
 			'\n' \
 			'install: $(LIB) install_bsd lib_user install_user\n' \
@@ -2104,7 +2104,6 @@ pf.addSourceFiles(
 in_cksum = Module('in_cksum')
 in_cksum.addRTEMSHeaderFiles(
 	[
-		'sparc/include/freebsd/machine/in_cksum.h',
         ]
 )
 in_cksum.addCPUDependentHeaderFiles(




More information about the vc mailing list