DELTA SVNƒWƒY€ƒWƒW--- SCP/makefile.orig 2020-08-23 21:51:23 UTC +++ SCP/makefile @@ -532,10 +532,12 @@ ifneq ($(DONT_USE_READER_THREAD),) endif -# Shut up annoying clang default warnings. +# Shut up annoying clang default warnings, and also fix +# multiply defined symbols on clang 11 and above -ifeq ($(GCC),clang) +ifeq ($(findstring clang,$(COMPILER_NAME)),clang) OS_CCDEFS += -Wno-parentheses -Wno-bitwise-op-parentheses -Wno-dangling-else + CFLAGS_O += -fcommon endif ENDREP id: 4-546863.0.r546863/501 type: file count: 0 text: 546863 0 488 471 458077db511ebdffb40d7e2c9b6a416a 0eff2a5d6231e4f3fa9f5c79a5ed7b223400ce2b 546862-bpyn/_6 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/emulators/simh-hp2100/files/patch-SCP_makefile copyroot: 0 / PLAIN K 7 LICENSE V 28 file b-538699.0.r538699/3661 K 11 hp2100.1.in V 28 file e-538699.0.r538699/3948 K 18 patch-SCP_makefile V 27 file 4-546863.0.r546863/501 END ENDREP id: a-538699.0.r546863/963 type: dir pred: a-538699.0.r538699/4354 count: 1 text: 546863 792 158 0 e0c6849584e0a17f05aec16c1ab70fc5 cpath: /head/emulators/simh-hp2100/files copyroot: 0 / PLAIN K 8 Makefile V 26 file 5-538699.0.r541475/57 K 8 distinfo V 28 file 8-538699.0.r538699/3383 K 5 files V 26 dir a-538699.0.r546863/963 K 9 pkg-descr V 28 file g-538699.0.r538699/4514 K 9 pkg-plist V 28 file i-538699.0.r538699/4794 END ENDREP id: 4-538699.0.r546863/1398 type: dir pred: 4-538699.0.r541475/608 count: 2 text: 546863 1151 234 0 6626c7e21d7452351b92f4648ea48a2c cpath: /head/emulators/simh-hp2100 copyroot: 0 / PLAIN K 8 Makefile V 28 file 2-1901.0.r546333/431912 K 6 adamem V 28 dir 4-56933.0.r536693/422112 K 11 advancemame V 26 dir 4-185890.0.r546375/568 K 11 advancemenu V 28 dir 4-185893.0.r517045/29976 K 11 advancemess V 28 dir e-185890.0.r517045/30643 K 8 almostti V 26 dir 4-439436.0.r546700/548 K 5 anese V 26 dir 4-510735.0.r510749/565 K 5 aqemu V 30 dir 2-219775.0.r507372/1740549 K 8 atari800 V 27 dir 2-8387.0.r517560/490251 K 3 bfe V 26 dir 2-25419.0.r491824/1076 K 5 bochs V 27 dir 2-9124.0.r517560/490985 K 4 bsvc V 24 dir 2-5848.0.r517268/558 K 10 cannonball V 29 dir 4-506026.0.r519824/811145 K 4 cinc V 25 dir 4-61615.0.r546758/596 K 5 cingb V 27 dir 4-41779.0.r516802/39513 K 5 citra V 27 dir 4-423700.0.r546076/1335 K 9 citra-qt5 V 27 dir c-423700.0.r546076/1886 K 6 cpmemu V 28 dir 2-1898.0.r386312/1068257 K 8 cpmtools V 24 dir 2-639.0.r546772/1114 K 9 cpmtools2 V 30 dir 4-215562.0.r412346/3770302 K 7 darcnes V 28 dir 4-41785.0.r517008/480556 K 8 dgen-sdl V 27 dir 4-32900.0.r517045/32774 K 11 dolphin-emu V 36 dir 4-282862.0-330484.r542069/452722 K 6 dosbox V 26 dir 4-79969.0.r529043/1562 K 14 dosbox-staging V 33 dir 4-79969.0-545581.r546059/1237 K 7 dtcyber V 26 dir 4-173209.0.r546818/654 K 7 dynagen V 29 dir 4-176880.0.r528058/618676 K 18 dynamips-community V 29 dir 4-273124.0.r488341/974910 K 5 e-uae V 26 dir 4-129200.0.r546823/650 K 9 edumips64 V 27 dir 4-500854.0.r531827/1331 K 11 elliott-803 V 34 dir 2-540929.0-540941.r541324/1175 K 5 emu64 V 27 dir 4-529184.0.r532092/1697 K 16 emulationstation V 29 dir 4-491326.0.r519824/813109 K 5 fceux V 28 dir m-85227.0.r536497/499854 K 4 fmsx V 26 dir 2-5767.0.r516802/42402 K 5 frodo V 26 dir 2-9873.0.r517045/35643 K 6 fs-uae V 26 dir 4-347825.0.r538163/599 K 15 fs-uae-launcher V 29 dir 4-372150.0.r531396/541537 K 4 fuse V 28 dir 4-92575.0.r517560/491670 K 9 fuse-roms V 26 dir 5-333630.0.r476369/525 K 10 fuse-utils V 28 dir 4-231401.0.r517045/37007 K 3 gbe V 27 dir 4-41461.0.r516802/44492 K 4 gem5 V 29 dir 4-384601.0.r539491/575009 K 4 gens V 28 dir 4-138544.0.r517045/37756 K 4 gngb V 27 dir 4-41784.0.r517045/38445 K 5 gngeo V 28 dir 4-149037.0.r517045/39184 K 6 gxemul V 29 dir 4-135684.0.r516140/428907 K 6 hatari V 28 dir 4-104148.0.r516802/46711 K 8 hercules V 27 dir 4-59974.0.r508837/60624 K 5 higan V 34 dir 4-238545.0-312766.r525644/2365 K 4 hugo V 28 dir 4-163616.0.r517045/40784 K 9 i386-wine V 36 dir 4-315245.0-324613.r539770/386187 K 15 i386-wine-devel V 29 dir 4-315245.0.r539770/387094 K 4 ines V 26 dir 2-4493.0.r516802/48258 K 8 javatari V 26 dir 4-317067.0.r519846/567 K 7 joytran V 28 dir 4-283445.0.r517045/41486 K 6 jzintv V 27 dir 4-210659.0.r512444/3450 K 5 kcemu V 28 dir 4-287922.0.r516802/49704 K 5 klh10 V 27 dir 4-73485.0.r508837/66279 K 6 lib765 V 29 dir 4-92571.0.r412346/3795088 K 6 libdsk V 27 dir 4-207299.0.r477950/2175 K 15 libretro-ppsspp V 27 dir 4-540656.0.r540656/2050 K 11 libspectrum V 27 dir 4-92573.0.r517045/42187 K 8 linux-c7 V 38 dir a2-368845.26-424259.r512486/472106 K 27 linux-power9-functional-sim V 29 dir 4-483454.0.r503726/543398 K 13 linux_base-c7 V 34 dir 4-157591.0-421391.r534102/2903 K 6 lisaem V 30 dir 4-195326.0.r507372/1748889 K 4 mame V 27 dir 4-185897.0.r544568/7500 K 10 mastergear V 26 dir 2-4492.0.r516802/51137 K 8 mednafen V 26 dir 4-165093.0.r546260/633 K 5 mesen V 28 dir 2-505721.0.r517045/43677 K 4 mess V 27 dir 4-185900.0.r544568/8151 K 4 mgba V 27 dir 4-451322.0.r538596/3448 K 6 mtools V 25 dir 3-181.0.r516802/52610 K 11 mupen64plus V 28 dir 4-213424.0.r508837/73174 K 21 mupen64plus-audio-sdl V 27 dir 4-213418.0.r389666/3846 K 16 mupen64plus-core V 27 dir m-213402.0.r546737/1739 K 21 mupen64plus-input-sdl V 26 dir 4-213420.0.r502559/423 K 19 mupen64plus-plugins V 30 dir 4-287769.0.r412346/3803662 K 14 mupen64plus-qt V 27 dir 4-443667.0.r534223/1073 K 20 mupen64plus-rsp-cxd4 V 30 dir 2-389665.0.r507372/1752458 K 19 mupen64plus-rsp-hle V 27 dir 8-213415.0.r364872/5264 K 19 mupen64plus-rsp-z64 V 30 dir 4-287765.0.r412346/3804931 K 22 mupen64plus-ui-console V 27 dir 2-266186.0.r389666/8653 K 27 mupen64plus-video-arachnoid V 28 dir 4-287766.0.r516802/54712 K 25 mupen64plus-video-glide64 V 28 dir 4-287767.0.r517045/45856 K 28 mupen64plus-video-glide64mk2 V 36 dir 4-287767.0-329345.r519824/813819 K 22 mupen64plus-video-rice V 28 dir c-213413.0.r516802/56768 K 21 mupen64plus-video-z64 V 28 dir 4-287768.0.r517045/47271 K 4 nemu V 27 dir 4-522033.0.r531664/1413 K 8 nestopia V 29 dir 4-406633.0.r529327/465673 K 9 nonpareil V 29 dir 4-168901.0.r536497/501338 K 4 o2em V 28 dir 4-138301.0.r508837/73979 K 10 ods2reader V 27 dir 4-154383.0.r536043/1341 K 13 open-vm-tools V 27 dir 2-210012.0.r546031/2736 K 19 open-vm-tools-nox11 V 28 dir 2-213113.0.r436703/10398 K 7 openmsx V 34 dir 4-154507.0-533890.r533890/2422 K 12 p5-Acme-6502 V 29 dir 4-300440.0.r474242/706533 K 15 parallels-tools V 27 dir 4-235803.0.r500851/1807 K 4 pcem V 29 dir 4-500881.0.r535516/551584 K 5 pcemu V 26 dir 2-1211.0.r516802/58193 K 5 pcsxr V 29 dir 4-259739.0.r519931/419476 K 9 playonbsd V 29 dir 4-409105.0.r535516/552333 K 6 ppsspp V 27 dir 4-387239.0.r542115/1260 K 10 ppsspp-qt5 V 27 dir b-422825.0.r540656/3988 K 17 py-gns3-converter V 30 dir 4-392943.0.r455210/1613804 K 10 py-unicorn V 27 dir 4-428964.0.r538723/2087 K 4 qemu V 27 dir 4-110715.0.r542594/1250 K 10 qemu-cheri V 26 dir 4-407321.0.r540986/800 K 10 qemu-devel V 30 dir 12-110715.0.r535391/421062 K 12 qemu-powernv V 34 dir 4-446697.0-486085.r531653/1238 K 11 qemu-sbruno V 26 dir 4-375864.0.r533403/652 K 16 qemu-user-static V 34 dir 4-375864.0-533075.r533075/2260 K 22 qemu-user-static-devel V 34 dir 4-375864.0-518822.r528752/1805 K 10 qemu-utils V 26 dir 6-423989.0.r543438/575 K 6 qemu31 V 36 dir 4-110715.0-518393.r535391/421920 K 6 qemu41 V 34 dir 4-110715.0-541864.r541864/3167 K 6 qemu50 V 28 dir 4-542535.0.r542535/13678 K 4 qmc2 V 27 dir 4-186179.0.r540059/1415 K 7 quasi88 V 27 dir 2-19253.0.r517045/53242 K 11 riscv-fesvr V 27 dir 4-433560.0.r481272/1172 K 13 riscv-isa-sim V 30 dir e-433560.0.r507372/1756908 K 5 rpcs3 V 27 dir 4-443906.0.r546305/1255 K 3 rtc V 28 dir 2-27306.0.r516983/419993 K 15 rubygem-fission V 26 dir 4-373948.0.r509685/591 K 4 simh V 24 dir j-8523.0.r529094/592 K 11 simh-hp2100 V 27 dir 4-538699.0.r546863/1398 K 11 simh-hp3000 V 26 dir 4-538700.0.r542591/639 K 10 simh-hpdoc V 26 dir 4-534055.0.r534067/618 K 6 skyeye V 26 dir 4-140313.0.r541195/568 K 10 snes9x-gtk V 28 dir 4-248720.0.r517045/53936 K 4 spim V 27 dir 2-4193.0.r517008/483039 K 6 stella V 25 dir 2-7447.0.r541047/1439 K 5 stonx V 26 dir 2-8422.0.r516802/64141 K 3 teo V 28 dir 4-492411.0.r516802/64871 K 6 tiemu3 V 28 dir 4-199151.0.r517045/55368 K 5 tilem V 28 dir 4-172324.0.r517045/56070 K 3 tme V 28 dir 4-180383.0.r517045/56817 K 12 tpm-emulator V 27 dir 4-264184.0.r545265/1845 K 6 tuxnes V 27 dir 2-25743.0.r516802/65560 K 3 uae V 27 dir 2-32335.0.r517045/57512 K 6 ucon64 V 27 dir 4-322700.0.r503742/3237 K 7 ukncbtl V 26 dir 4-520616.0.r520816/515 K 7 unicorn V 27 dir 4-428645.0.r538723/4146 K 3 vba V 27 dir 4-90118.0.r517045/58245 K 8 vboxtool V 29 dir 4-300839.0.r490472/872192 K 7 vgb-bin V 27 dir 4-31506.0.r516802/66210 K 8 vgba-bin V 27 dir g-31506.0.r516802/66865 K 4 vice V 25 dir 2-11843.0.r543240/640 K 14 virtualbox-ose V 28 dir q-235883.0.r546807/11052 K 24 virtualbox-ose-additions V 28 dir 4-247789.0.r544898/12413 K 30 virtualbox-ose-additions-nox11 V 27 dir 4-423312.0.r501807/4077 K 19 virtualbox-ose-kmod V 27 dir 1c-235883.0.r545087/633 K 20 virtualbox-ose-nox11 V 34 dir 6-418067.0-423381.r514643/4753 K 18 visualboyadvance-m V 27 dir 4-261237.0.r546257/1172 K 5 vmips V 29 dir 4-114834.0.r484628/699520 K 9 vmsbackup V 24 dir 2-1463.0.r453625/556 K 3 vmw V 26 dir 4-177727.0.r536186/594 K 4 vpcs V 30 dir 4-401895.0.r415498/1207275 K 7 vxtools V 26 dir 2-31088.0.r348220/3244 K 4 wine V 24 dir 2-898.0.r544494/1055 K 10 wine-devel V 24 dir 7-898.0.r545499/2284 K 10 wine-gecko V 27 dir 4-274146.0.r524678/4921 K 16 wine-gecko-devel V 27 dir e-274146.0.r520892/3210 K 9 wine-mono V 26 dir 4-302265.0.r534247/532 K 15 wine-mono-devel V 34 dir 4-302265.0-338526.r539428/1910 K 10 winetricks V 27 dir 4-425599.0.r529210/1218 K 13 wxmupen64plus V 29 dir 4-287565.0.r535516/553090 K 12 x16-emulator V 27 dir 4-529251.0.r546337/1358 K 7 x16-rom V 27 dir i-529251.0.r546337/2307 K 3 x48 V 26 dir 2-4147.0.r516802/70729 K 5 x49gp V 28 dir 4-339966.0.r516802/71524 K 12 xbraitenberg V 28 dir 4-105484.0.r516802/72224 K 4 xcpc V 28 dir 4-213997.0.r516802/72930 K 10 xen-kernel V 34 dir 2-475255.0-494040.r546327/4075 K 6 xhomer V 28 dir 4-168003.0.r516802/73626 K 9 xsystem35 V 27 dir 2-14623.0.r516802/74367 K 3 xzx V 26 dir 2-8599.0.r516802/75050 K 4 yuzu V 34 dir 4-423700.0-505393.r546306/1406 K 8 yuzu-qt5 V 34 dir c-423700.1-505393.r546130/3159 K 5 zsnes V 26 dir 4-42775.0.r546767/1436 END ENDREP id: 1-181.0.r546863/10426 type: dir pred: 1-181.0.r546823/9672 count: 8457 text: 546863 1581 8832 0 5f7b0f1d36750ba6a400a7207f201ed2 cpath: /head/emulators copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 26 file 1-411777.0.r467740/54 K 11 .gitauthors V 26 file 1-467739.0.r543472/88 K 10 .gitignore V 26 file 1-348322.0.r458023/77 K 11 .gitmessage V 27 file 3-457790.0.r457790/987 K 7 CHANGES V 26 file 1-99373.0.r537134/686 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r521639/51 K 4 GIDs V 28 file 1-168311.0.r540988/2026 K 8 Keywords V 27 dir 1-314142.0.r535225/1330 K 5 LEGAL V 25 file 1-748.0.r546333/2239 K 5 MOVED V 27 file 1-69878.0.r546701/3371 K 8 Makefile V 23 file 1-6.0.r516635/2409 K 2 Mk V 22 dir 1-5.0.r545813/7522 K 6 README V 25 file 1-2408.0.r494236/641 K 9 Templates V 24 dir 1-2932.0.r544150/817 K 5 Tools V 26 dir 3-15302.0.r545812/3025 K 4 UIDs V 28 file 4-168311.0.r540988/2307 K 8 UPDATING V 29 file 1-102685.0.r544763/19290 K 13 accessibility V 27 dir 1-42583.0.r544824/80705 K 6 arabic V 27 dir 1-38973.0.r545101/55222 K 9 archivers V 25 dir 1-242.0.r546843/13852 K 5 astro V 24 dir 1-301.0.r546693/7314 K 5 audio V 25 dir 1-148.0.r546837/44726 K 4 base V 27 dir 1-420954.0.r542956/1557 K 10 benchmarks V 23 dir 1-62.0.r546128/6074 K 7 biology V 25 dir 1-9066.0.r546790/9799 K 3 cad V 24 dir 1-276.0.r546824/7368 K 7 chinese V 26 dir 1-3770.0.r545101/62121 K 5 comms V 24 dir 1-76.0.r546827/11236 K 10 converters V 26 dir 1-1561.0.r546844/11339 K 9 databases V 25 dir 1-771.0.r546792/57213 K 9 deskutils V 26 dir 1-2098.0.r546847/15166 K 5 devel V 25 dir 1-73.0.r546846/376936 K 3 dns V 26 dir 1-6145.0.r546822/13208 K 7 editors V 23 dir 4-6.0.r546765/16101 K 9 emulators V 25 dir 1-181.0.r546863/10426 K 7 finance V 25 dir 1-4110.0.r546194/8309 K 6 french V 28 dir 1-25673.0.r545101/149811 K 3 ftp V 24 dir 1-199.0.r546671/5355 K 5 games V 25 dir 1-104.0.r546833/56554 K 6 german V 25 dir 1-7451.0.r546219/2337 K 8 graphics V 24 dir 1-94.0.r546859/59402 K 6 hebrew V 28 dir 3-31142.0.r545101/152981 K 9 hungarian V 29 dir 1p-38973.0.r545101/154252 K 3 irc V 23 dir 1-42.0.r546364/6660 K 8 japanese V 26 dir 1-410.0.r546333/568454 K 4 java V 25 dir 1-2798.0.r546732/7599 K 6 korean V 25 dir 1-5873.0.r546704/6552 K 4 lang V 24 dir 1-15.0.r546851/19085 K 4 mail V 24 dir 1-57.0.r546829/39388 K 4 math V 25 dir 1-162.0.r546799/50240 K 4 misc V 24 dir 7-35.0.r546820/27322 K 10 multimedia V 25 dir d-333.0.r546860/24973 K 3 net V 24 dir 1-22.0.r546850/82239 K 6 net-im V 28 dir 15-11144.0.r546740/10127 K 8 net-mgmt V 26 dir r-1011.0.r546749/21671 K 7 net-p2p V 26 dir g-29106.0.r546672/5833 K 4 news V 24 dir 1-145.0.r546797/4272 K 6 polish V 27 dir tv-38973.0.r546220/1960 K 10 ports-mgmt V 25 dir 1-5132.0.r546730/5059 K 10 portuguese V 28 dir 1-17842.0.r545101/175875 K 5 print V 24 dir 1-79.0.r546861/16712 K 7 russian V 27 dir 1-1559.0.r545101/178434 K 7 science V 26 dir n-5356.0.r546838/17609 K 8 security V 25 dir 1-269.0.r546813/68707 K 6 shells V 22 dir w-6.0.r546831/3621 K 8 sysutils V 25 dir b-339.0.r546852/78196 K 8 textproc V 26 dir 1-322.0.r546839/104861 K 9 ukrainian V 28 dir g-39704.0.r545101/179789 K 10 vietnamese V 27 dir 1-4812.0.r545101/181488 K 3 www V 26 dir 1-114.0.r546857/136432 K 3 x11 V 24 dir 1-16.0.r546853/27491 K 10 x11-clocks V 24 dir 1-931.0.r546024/3679 K 11 x11-drivers V 27 dir 1-157567.0.r546109/7352 K 6 x11-fm V 24 dir 1-691.0.r546724/4498 K 9 x11-fonts V 25 dir 1-543.0.r546773/15132 K 11 x11-servers V 25 dir 1n-710.0.r546228/1930 K 10 x11-themes V 28 dir 1-14410.0.r546333/874194 K 12 x11-toolkits V 25 dir 1-120.0.r546852/92477 K 6 x11-wm V 23 dir 1-40.0.r546780/7121 END ENDREP id: 2-1.0.r546863/14165 type: dir pred: 2-1.0.r546861/20446 count: 537105 text: 546863 10597 3555 0 61eddeade3894885dbac1ca8bc5094c2 props: 458023 3927 157 0 4d85142843815bcc29c89469bccb873c cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r546862/22698 K 4 head V 23 dir 2-1.0.r546863/14165 K 8 projects V 24 dir 0-377393.0.r441387/0 K 8 svnadmin V 22 dir 3-1.0.r545764/1241 K 4 tags V 22 dir 8-1.0.r536699/5595 END ENDREP id: 0.0.r546863/14602 type: dir pred: 0.0.r546862/23093 count: 546863 text: 546863 14384 205 0 1e188b0d02a0c17ecb49d7786dbf0def props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 59 _4.0.t546862-bpyn add-file true true /head/emulators/simh-hp2100/files/patch-SCP_makefile 14602 14826