summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-01-16 23:57:40 +0000
committerMike Frysinger <vapier@gentoo.org>2010-01-16 23:57:40 +0000
commit46695799acf9ab7a099e3a98bc0c4134b25dbae3 (patch)
tree657d47e64cdbbee0daa0b88c4467c43a9dc11035 /sys-power/cpufrequtils/files
parentold (diff)
downloadhistorical-46695799acf9ab7a099e3a98bc0c4134b25dbae3.tar.gz
historical-46695799acf9ab7a099e3a98bc0c4134b25dbae3.tar.bz2
historical-46695799acf9ab7a099e3a98bc0c4134b25dbae3.zip
Version bump.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'sys-power/cpufrequtils/files')
-rw-r--r--sys-power/cpufrequtils/files/cpufrequtils-007-build.patch14
-rw-r--r--sys-power/cpufrequtils/files/cpufrequtils-007-nls.patch76
2 files changed, 90 insertions, 0 deletions
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-007-build.patch b/sys-power/cpufrequtils/files/cpufrequtils-007-build.patch
new file mode 100644
index 000000000000..3e0d18b0ab3d
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-007-build.patch
@@ -0,0 +1,14 @@
+--- Makefile
++++ Makefile
+@@ -158,11 +158,9 @@ endif
+
+ # if DEBUG is enabled, then we do not strip or optimize
+ ifeq ($(strip $(DEBUG)),true)
+- CFLAGS += -O1 -g
+ CPPFLAGS += -DDEBUG
+ STRIPCMD = /bin/true -Since_we_are_debugging
+ else
+- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
+ STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+ endif
+
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-007-nls.patch b/sys-power/cpufrequtils/files/cpufrequtils-007-nls.patch
new file mode 100644
index 000000000000..83ab0b11f0cd
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-007-nls.patch
@@ -0,0 +1,76 @@
+make nls/gettext support optional
+
+patch by
+Jos van der Ende <seraph@xs4all.nl>
+Lars Wendler <polynomial-c@gentoo.org>
+
+http://bugs.gentoo.org/205576
+http://bugs.gentoo.org/292246
+
+--- cpufrequtils-006/Makefile
++++ cpufrequtils-006/Makefile
+@@ -147,6 +147,7 @@
+ ifeq ($(strip $(NLS)),true)
+ INSTALL_NLS += install-gmo
+ COMPILE_NLS += update-gmo
++ CPPFLAGS += -DNLS
+ endif
+
+ ifeq ($(strip $(CPUFRQ_BENCH)),true)
+--- cpufrequtils-006/utils/info.c
++++ cpufrequtils-006/utils/info.c
+@@ -10,7 +10,6 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <libintl.h>
+ #include <locale.h>
+
+ #include <getopt.h>
+@@ -18,9 +17,18 @@
+ #include "cpufreq.h"
+
+
++#ifdef NLS
++#include <libintl.h>
+ #define _(String) gettext (String)
+ #define gettext_noop(String) String
+ #define N_(String) gettext_noop (String)
++#else
++#define gettext_noop(String) String
++#define _(String) gettext_noop (String)
++#define gettext(String) gettext_noop (String)
++#define N_(String) gettext_noop (String)
++#define textdomain(String)
++#endif
+
+ #define LINE_LEN 10
+
+--- cpufrequtils-006/utils/set.c
++++ cpufrequtils-006/utils/set.c
+@@ -12,16 +12,24 @@
+ #include <limits.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <libintl.h>
+ #include <locale.h>
+
+ #include <getopt.h>
+
+ #include "cpufreq.h"
+
++#ifdef NLS
++#include <libintl.h>
+ #define _(String) gettext(String)
+ #define gettext_noop(String) String
+ #define N_(String) gettext_noop(String)
++#else
++#define gettext_noop(String) String
++#define _(String) gettext_noop (String)
++#define gettext(String) gettext_noop (String)
++#define N_(String) gettext_noop (String)
++#define textdomain(String)
++#endif
+
+ #define NORM_FREQ_LEN 32
+