| 1 |
flameeyes 12/04/30 22:19:55 |
| 2 |
|
| 3 |
Added: lynx-2.8.8_pre12-parallel.patch |
| 4 |
Log: |
| 5 |
Add a patch to fix building lynx in parallel. Closes bug #403905. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/lynx/files/lynx-2.8.8_pre12-parallel.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/lynx/files/lynx-2.8.8_pre12-parallel.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/lynx/files/lynx-2.8.8_pre12-parallel.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lynx-2.8.8_pre12-parallel.patch |
| 16 |
=================================================================== |
| 17 |
Index: lynx2-8-8/src/makefile.in |
| 18 |
=================================================================== |
| 19 |
--- lynx2-8-8.orig/src/makefile.in |
| 20 |
+++ lynx2-8-8/src/makefile.in |
| 21 |
@@ -100,7 +100,7 @@ all: lynx$x |
| 22 |
@RULE_CC@ |
| 23 |
@ECHO_CC@$(CPP) -C $(CPP_OPTS) $< >$@ |
| 24 |
|
| 25 |
-lynx$x: message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB) |
| 26 |
+lynx$x: message $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB) |
| 27 |
@echo "Linking and creating Lynx executable" |
| 28 |
$(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LDFLAGS) $(LIBS) $(INTLLIB) |
| 29 |
@echo "Copying Lynx executable into top-level directory" |
| 30 |
@@ -111,21 +111,12 @@ lynx$x: message do_chartrans_stuff $(t |
| 31 |
message: |
| 32 |
@echo "Compiling Lynx sources" |
| 33 |
|
| 34 |
-do_chartrans_stuff: |
| 35 |
- -cd chrtrans && $(MAKE) \ |
| 36 |
- SITE_DEFS="$(SITE_DEFS)" \ |
| 37 |
- BUILD_CFLAGS="$(BUILD_CFLAGS)" \ |
| 38 |
- BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \ |
| 39 |
- BUILD_LDFLAGS="$(BUILD_LDFLAGS)" \ |
| 40 |
- BUILD_LIBS="$(BUILD_LIBS)" \ |
| 41 |
- BUILD_CC="$(BUILD_CC)" tables |
| 42 |
- |
| 43 |
lint: |
| 44 |
$(LINT) $(LINTOPTS) $(CPP_OPTS) $(C_SRC) 2>&1 |tee $(top_builddir)/lint.lynx |
| 45 |
|
| 46 |
clean: |
| 47 |
rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_* |
| 48 |
- cd chrtrans && $(MAKE) clean |
| 49 |
+ $(MAKE) -C chrtrans clean |
| 50 |
|
| 51 |
tags: |
| 52 |
$(CTAGS) *.[ch] |
| 53 |
@@ -169,9 +160,11 @@ TABLES= \ |
| 54 |
$(CHRTR)cp775_uni.h \ |
| 55 |
$(CHRTR)cp850_uni.h \ |
| 56 |
$(CHRTR)cp852_uni.h \ |
| 57 |
+ $(CHRTR)cp857_uni.h \ |
| 58 |
$(CHRTR)cp862_uni.h \ |
| 59 |
$(CHRTR)cp864_uni.h \ |
| 60 |
$(CHRTR)cp866_uni.h \ |
| 61 |
+ $(CHRTR)cp866u_uni.h \ |
| 62 |
$(CHRTR)cp869_uni.h \ |
| 63 |
$(CHRTR)def7_uni.h \ |
| 64 |
$(CHRTR)dmcs_uni.h \ |
| 65 |
@@ -186,27 +179,29 @@ TABLES= \ |
| 66 |
$(CHRTR)iso08_uni.h \ |
| 67 |
$(CHRTR)iso09_uni.h \ |
| 68 |
$(CHRTR)iso10_uni.h \ |
| 69 |
+ $(CHRTR)iso13_uni.h \ |
| 70 |
+ $(CHRTR)iso14_uni.h \ |
| 71 |
$(CHRTR)iso15_uni.h \ |
| 72 |
$(CHRTR)koi8r_uni.h \ |
| 73 |
+ $(CHRTR)koi8u_uni.h \ |
| 74 |
$(CHRTR)mac_uni.h \ |
| 75 |
$(CHRTR)mnem_suni.h \ |
| 76 |
$(CHRTR)mnem2_suni.h \ |
| 77 |
$(CHRTR)next_uni.h \ |
| 78 |
+ $(CHRTR)pt154_uni.h \ |
| 79 |
$(CHRTR)rfc_suni.h \ |
| 80 |
$(CHRTR)utf8_uni.h \ |
| 81 |
$(CHRTR)viscii_uni.h |
| 82 |
|
| 83 |
-$(TABLES): |
| 84 |
- -cd chrtrans && $(MAKE) tables |
| 85 |
+$(TABLES): chrtrans/makeuctb$(BUILD_EXEEXT) |
| 86 |
+ $(MAKE) -C chrtrans `basename $@` |
| 87 |
|
| 88 |
UCdomap$o : UCdomap.c \ |
| 89 |
chrtrans/UCkd.h \ |
| 90 |
- chrtrans/makeuctb$(BUILD_EXEEXT) \ |
| 91 |
- chrtrans/makeuctb.c \ |
| 92 |
- UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h |
| 93 |
+ UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h |
| 94 |
|
| 95 |
chrtrans/makeuctb$(BUILD_EXEEXT): |
| 96 |
- cd chrtrans; make makeuctb$(BUILD_EXEEXT) |
| 97 |
+ $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT) |
| 98 |
|
| 99 |
UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h |
| 100 |
LYCookie$o : $(top_srcdir)/userdefs.h |
| 101 |
Index: lynx2-8-8/src/chrtrans/makefile.in |
| 102 |
=================================================================== |
| 103 |
--- lynx2-8-8.orig/src/chrtrans/makefile.in |
| 104 |
+++ lynx2-8-8/src/chrtrans/makefile.in |
| 105 |
@@ -67,57 +67,8 @@ FONTMAP_INC = iso01_uni.h# default, if n |
| 106 |
|
| 107 |
MAKEUCTB = makeuctb$(BUILD_EXEEXT) |
| 108 |
|
| 109 |
-TABLES= \ |
| 110 |
- cp1250_uni.h \ |
| 111 |
- cp1251_uni.h \ |
| 112 |
- cp1252_uni.h \ |
| 113 |
- cp1253_uni.h \ |
| 114 |
- cp1255_uni.h \ |
| 115 |
- cp1256_uni.h \ |
| 116 |
- cp1257_uni.h \ |
| 117 |
- cp437_uni.h \ |
| 118 |
- cp737_uni.h \ |
| 119 |
- cp775_uni.h \ |
| 120 |
- cp850_uni.h \ |
| 121 |
- cp852_uni.h \ |
| 122 |
- cp857_uni.h \ |
| 123 |
- cp862_uni.h \ |
| 124 |
- cp864_uni.h \ |
| 125 |
- cp866_uni.h \ |
| 126 |
- cp866u_uni.h \ |
| 127 |
- cp869_uni.h \ |
| 128 |
- def7_uni.h \ |
| 129 |
- dmcs_uni.h \ |
| 130 |
- hp_uni.h \ |
| 131 |
- iso01_uni.h \ |
| 132 |
- iso02_uni.h \ |
| 133 |
- iso03_uni.h \ |
| 134 |
- iso04_uni.h \ |
| 135 |
- iso05_uni.h \ |
| 136 |
- iso06_uni.h \ |
| 137 |
- iso07_uni.h \ |
| 138 |
- iso08_uni.h \ |
| 139 |
- iso09_uni.h \ |
| 140 |
- iso10_uni.h \ |
| 141 |
- iso13_uni.h \ |
| 142 |
- iso14_uni.h \ |
| 143 |
- iso15_uni.h \ |
| 144 |
- koi8r_uni.h \ |
| 145 |
- koi8u_uni.h \ |
| 146 |
- mac_uni.h \ |
| 147 |
- mnem2_suni.h \ |
| 148 |
- mnem_suni.h \ |
| 149 |
- next_uni.h \ |
| 150 |
- next_uni.h \ |
| 151 |
- pt154_uni.h \ |
| 152 |
- rfc_suni.h \ |
| 153 |
- utf8_uni.h \ |
| 154 |
- viscii_uni.h |
| 155 |
- |
| 156 |
default: $(FONTMAP_INC) |
| 157 |
|
| 158 |
-tables: $(TABLES) |
| 159 |
- |
| 160 |
OBJS = makeuctb$o |
| 161 |
C_SRC = $(OBJS:$o=.c) |
Archives