| 1 |
mr_bones_ 10/12/01 05:45:13 |
| 2 |
|
| 3 |
Added: lgeneral-1.2-make-382.patch |
| 4 |
lgeneral-1.2-as-needed.patch |
| 5 |
lgeneral-1.2-build.patch |
| 6 |
lgeneral-1.2-gentoo-path.patch |
| 7 |
Log: |
| 8 |
version bump |
| 9 |
|
| 10 |
(Portage version: 2.1.9.24/cvs/Linux i686) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 games-strategy/lgeneral/files/lgeneral-1.2-make-382.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/files/lgeneral-1.2-make-382.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/files/lgeneral-1.2-make-382.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: lgeneral-1.2-make-382.patch |
| 19 |
=================================================================== |
| 20 |
http://bugs.gentoo.org/337610 |
| 21 |
|
| 22 |
--- intl/Makefile.in |
| 23 |
+++ intl/Makefile.in |
| 24 |
@@ -206,12 +206,12 @@ |
| 25 |
# The dependency for intlh.inst is different in gettext and all other |
| 26 |
# packages. Because we cannot you GNU make features we have to solve |
| 27 |
# the problem while rewriting Makefile.in. |
| 28 |
-@GT_YES@×××××.inst: intlh.inst.in ../config.status |
| 29 |
-@GT_YES@ cd .. \ |
| 30 |
-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ |
| 31 |
-@GT_YES@ $(SHELL) ./config.status |
| 32 |
-@GT_NO@.PHONY: intlh.inst |
| 33 |
-@GT_NO@×××××.inst: |
| 34 |
+intlh.inst: intlh.inst.in ../config.status |
| 35 |
+ cd .. \ |
| 36 |
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ |
| 37 |
+ $(SHELL) ./config.status |
| 38 |
+.PHONY: intlh.inst |
| 39 |
+intlh.inst: |
| 40 |
|
| 41 |
# Tell versions [3.59,3.63) of GNU make not to export all variables. |
| 42 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 games-strategy/lgeneral/files/lgeneral-1.2-as-needed.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/files/lgeneral-1.2-as-needed.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/files/lgeneral-1.2-as-needed.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: lgeneral-1.2-as-needed.patch |
| 52 |
=================================================================== |
| 53 |
--- tools/ltrextract/Makefile.am.old 2009-02-12 09:48:37.000000000 +0100 |
| 54 |
+++ tools/ltrextract/Makefile.am 2009-02-12 09:50:36.000000000 +0100 |
| 55 |
@@ -3,9 +3,8 @@ |
| 56 |
|
| 57 |
bin_PROGRAMS = ltrextract |
| 58 |
|
| 59 |
-LIBS = $(top_builddir)/util/libutil.a $(INTLLIBS) |
| 60 |
AM_CFLAGS = -DLTREXTRACT -I$(LGENERAL_PATH) -I$(top_srcdir) -I$(top_srcdir)/util $(INTLINCLUDES) |
| 61 |
-ltrextract_LDFLAGS = -lm |
| 62 |
+ltrextract_LDADD = $(top_builddir)/util/libutil.a $(INTLLIBS) |
| 63 |
ltrextract_SOURCES = ltrextract.c util.c util.h \ |
| 64 |
terrain.c terrain.h map.c map.h nation.c nation.h \ |
| 65 |
unit_lib.c unit_lib.h scenario.c scenario.h campaign.c campaign.h \ |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.1 games-strategy/lgeneral/files/lgeneral-1.2-build.patch |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/files/lgeneral-1.2-build.patch?rev=1.1&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/files/lgeneral-1.2-build.patch?rev=1.1&content-type=text/plain |
| 73 |
|
| 74 |
Index: lgeneral-1.2-build.patch |
| 75 |
=================================================================== |
| 76 |
--- configure.in.old 2010-11-30 22:46:20.190215458 -0500 |
| 77 |
+++ configure.in 2010-11-30 22:47:07.138144807 -0500 |
| 78 |
@@ -11,9 +11,10 @@ |
| 79 |
dnl Checks for programs. |
| 80 |
AC_PROG_CC |
| 81 |
AC_PROG_RANLIB |
| 82 |
+AM_PROG_CC_C_O |
| 83 |
|
| 84 |
dnl various CFLAGS |
| 85 |
-CFLAGS="$CFLAGS -g -Wall" |
| 86 |
+CFLAGS="$CFLAGS -Wall" |
| 87 |
#CFLAGS="-O0 -g -Wall" |
| 88 |
|
| 89 |
dnl Checks for libraries. |
| 90 |
@@ -36,6 +37,7 @@ |
| 91 |
dnl L10n support |
| 92 |
ALL_LINGUAS="en de" |
| 93 |
|
| 94 |
+AC_GNU_SOURCE |
| 95 |
AM_GNU_GETTEXT |
| 96 |
|
| 97 |
XGETTEXTFLAGS= |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.1 games-strategy/lgeneral/files/lgeneral-1.2-gentoo-path.patch |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/files/lgeneral-1.2-gentoo-path.patch?rev=1.1&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/files/lgeneral-1.2-gentoo-path.patch?rev=1.1&content-type=text/plain |
| 105 |
|
| 106 |
Index: lgeneral-1.2-gentoo-path.patch |
| 107 |
=================================================================== |
| 108 |
diff -ru lgeneral-1.2.orig/configure.in lgeneral-1.2/configure.in |
| 109 |
--- lgeneral-1.2.orig/configure.in 2010-09-28 13:44:39.000000000 -0400 |
| 110 |
+++ lgeneral-1.2/configure.in 2010-11-30 22:37:30.245177173 -0500 |
| 111 |
@@ -106,13 +106,8 @@ |
| 112 |
|
| 113 |
dnl find out whether we can determine the path of the running executable |
| 114 |
ac_paths_determ=generic |
| 115 |
-AC_MSG_CHECKING(if executable's path can be determined at runtime) |
| 116 |
-readlink /proc/$$/exe >/dev/null 2>&1 && ac_paths_determ=linux |
| 117 |
-ac_can_determ_paths=yes |
| 118 |
-if test x$ac_paths_determ = xgeneric ; then |
| 119 |
ac_can_determ_paths=no |
| 120 |
AC_DEFINE_UNQUOTED(PATHS_GENERIC, 1, [Defined if detecting executable's path name is not supported at runtime.]) |
| 121 |
-fi |
| 122 |
AC_MSG_RESULT($ac_can_determ_paths) |
| 123 |
AC_MSG_RESULT(executable's path determination strategy... $ac_paths_determ) |
| 124 |
AM_CONDITIONAL(compile_paths_linux, test x$ac_paths_determ = xlinux) |
| 125 |
@@ -150,7 +145,7 @@ |
| 126 |
AC_SUBST(dl_lib_flag) |
| 127 |
|
| 128 |
dnl installation path |
| 129 |
-inst_dir=$datadir/games/lgeneral |
| 130 |
+inst_dir=$datadir/lgeneral |
| 131 |
inst_flag="-DINSTALLDIR=\\\"$inst_dir\\\"" |
| 132 |
|
| 133 |
dis_flag="" |
Archives