Cody Schafer avatar Cody Schafer committed 48d9504

have patch ignore whitespace so i don't fall into that hell again.

Comments (0)

Files changed (4)

 	download "gccdist.zip" \
 		"ftp://ftp.ni.com/pub/devzone/tut/updated_vxworks63gccdist.zip"
 	extract gccdist.zip
-	patch -d "$SRC/gccdist" -p1 < wrs_headers-regsPpc.patch || exit
-	patch -d "$SRC/gccdist" -p1 < wrs_headers-unistd.patch || exit
-	patch -d "$SRC/gccdist" -p1 < wrs_headers-ioLib.patch  || exit
-	patch -d "$SRC/gccdist" -p1 < wrs_headers-uio.patch  || exit
-	patch -d "$SRC/gccdist" -p1 < wrs_headers-cdefs.patch  || exit
+	patch -l -d "$SRC/gccdist" -p1 < wrs_headers-regsPpc.patch || exit
+	patch -l -d "$SRC/gccdist" -p1 < wrs_headers-unistd.patch || exit
+	patch -l -d "$SRC/gccdist" -p1 < wrs_headers-ioLib.patch  || exit
+	patch -l -d "$SRC/gccdist" -p1 < wrs_headers-uio.patch  || exit
+	patch -l -d "$SRC/gccdist" -p1 < wrs_headers-cdefs.patch  || exit
 }
 run wrs_headers
 
 prep_gcc ()
 {
-	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc.patch || exit 1
-	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc-4.6.2-vxworks-libstdcxx.patch || exit 1
-	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc-vxworks-libstdcxx-nominmax.patch || exit 1
-	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc-4.6.3-libstdcxx-stdint.patch || exit 1
+	patch -l -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc.patch || exit 1
+	patch -l -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc-4.6.2-vxworks-libstdcxx.patch || exit 1
+	patch -l -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc-vxworks-libstdcxx-nominmax.patch || exit 1
 	#( cd "$SRC/gcc-$GCC_VERSION" && ./contrib/download_prerequisites ) || exit
 }
 

gcc-4.6.3-libstdcxx-stdint.patch

-diff -durpN gcc-4.6.3.orig/libstdc++-v3/include/bits/atomic_base.h gcc-4.6.3/libstdc++-v3/include/bits/atomic_base.h
---- gcc-4.6.3.orig/libstdc++-v3/include/bits/atomic_base.h	2012-03-12 16:20:01.157339129 -0500
-+++ gcc-4.6.3/libstdc++-v3/include/bits/atomic_base.h	2012-03-12 16:22:43.708306967 -0500
-@@ -34,7 +34,7 @@
- 
- #include <bits/c++config.h>
- #include <stdbool.h>
--#include <stdint.h>
-+#include <gstdint.h>
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {

gcc-4.6.3-vxworks-libstdcxx.patch

-diff --git a/configure b/configure
-index 9136c24..9271ea1 100755
---- a/configure
-+++ b/configure
-@@ -3104,7 +3104,7 @@ esac
- case "${target}" in
-   *-*-vxworks*)
-     # VxWorks uses the Dinkumware C++ library.
--    noconfigdirs="$noconfigdirs target-libstdc++-v3"
-+    #noconfigdirs="$noconfigdirs target-libstdc++-v3"
-     ;;
-   arm*-wince-pe*)
-     # the C++ libraries don't build on top of CE's C libraries

gcc-4.7.0-vxworks-libstdcxx.patch

+diff --git a/configure b/configure
+index 9136c24..9271ea1 100755
+--- a/configure
++++ b/configure
+@@ -3104,7 +3104,7 @@ esac
+ case "${target}" in
+   *-*-vxworks*)
+     # VxWorks uses the Dinkumware C++ library.
+-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
++    #noconfigdirs="$noconfigdirs target-libstdc++-v3"
+     ;;
+   arm*-wince-pe*)
+     # the C++ libraries don't build on top of CE's C libraries
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.