summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-06-12 13:13:47 +0000
committerIgor Pashev <pashev.igor@gmail.com>2012-06-12 13:13:47 +0000
commitc95d5132227e177cf54955e0d63e811b8f00dd77 (patch)
treea0965464f4bbfcddf3595fbe12a61ad501956052
parente2184c7a8401148215986b03d1737a7d82024bd9 (diff)
downloadxutils-dev-c95d5132227e177cf54955e0d63e811b8f00dd77.tar.gz
Use GCC and /usr/bin/install
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/dyson-sun.cf.patch32
-rw-r--r--debian/patches/series1
3 files changed, 41 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a20de19..1a83372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xutils-dev (1:7.7~2+dyson1) UNRELEASED; urgency=low
+
+ * Built for Dyson
+ * Made GCC default
+ * Use /usr/bin/install
+
+ -- Igor Pashev <pashev.igor@gmail.com> Tue, 12 Jun 2012 13:13:05 +0000
+
xutils-dev (1:7.7~2) UNRELEASED; urgency=low
* xorg-cf-files: Debian GNU/Hurd uses /usr as ProjectRoot and /usr/share/man
diff --git a/debian/patches/dyson-sun.cf.patch b/debian/patches/dyson-sun.cf.patch
new file mode 100644
index 0000000..b79b942
--- /dev/null
+++ b/debian/patches/dyson-sun.cf.patch
@@ -0,0 +1,32 @@
+diff --git a/xorg-cf-files/sun.cf b/xorg-cf-files/sun.cf
+index 516a586..be70138 100644
+--- a/xorg-cf-files/sun.cf
++++ b/xorg-cf-files/sun.cf
+@@ -112,7 +112,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
+ */
+
+ #ifndef HasGcc3
+-#define HasGcc3 NO
++#define HasGcc3 YES
+ #endif
+ #ifndef HasGcc2
+ #define HasGcc2 HasGcc3
+@@ -430,7 +430,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
+ # endif
+ # endif
+ # if OSMinorVersion > 3
+-# define InstallCmd /usr/ucb/install
++# define InstallCmd /usr/bin/install
+ # endif
+ #ifndef LargefileDefines
+ # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
+@@ -668,6 +668,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
+ # endif
+ # endif
+ # if HasGcc2
++# ifndef DefaultGcc2OptimizeOpt
++# define DefaultGcc2OptimizeOpt -O2
++# endif
+ # ifndef CcCmd
+ # define CcCmd gcc
+ # endif
diff --git a/debian/patches/series b/debian/patches/series
index 0be66ef..6beb24b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
05_xaw_without_xp.diff
06_font_path.diff
07_gnu_manpath.diff
+dyson-sun.cf.patch