From c95d5132227e177cf54955e0d63e811b8f00dd77 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 12 Jun 2012 13:13:47 +0000 Subject: Use GCC and /usr/bin/install --- debian/changelog | 8 ++++++++ debian/patches/dyson-sun.cf.patch | 32 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 41 insertions(+) create mode 100644 debian/patches/dyson-sun.cf.patch 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 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 -- cgit v1.2.3