head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.114 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.112 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.110 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.108 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.106 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.104 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.102 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.100 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.98 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.96 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.94 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.92 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.90 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.88 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.86 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.84 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.82 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.80 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.78 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.76 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.74 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.72 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.70 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.66 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.46 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.68 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.64 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.62 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.60 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.58 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.56 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.54 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.52 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.50 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.48 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.44 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.42 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.40 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.38 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.36 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.34 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.32 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.30 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.28 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.26 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.24 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.22 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.20 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.18 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.16 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.14 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.12 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.10 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.8 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.6 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.4 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.2; locks; strict; comment @# @; 1.1 date 2012.06.02.23.34.56; author dholland; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2012.06.02.23.34.56; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2012.06.06.18.11.41; author tron; state Exp; branches; next ; desc @@ 1.1 log @Fix broken build. (1) With gcc 4.5, cpp does not fold lines separated by a escaped newline in the output. Therefore when nasd_rpcgen runs its rpc definitions through cpp, what comes out contains syntax errors. The parser then reports these with SIGSEGV. First fix the cpp plumbing to use the cpp tool wrapper during build, and then have it use -traditional. (2) On amd64, roughly half the build thinks it's actually i386. Patch the other half to agree. This may not turn out to work, but it does build instead of dumping out bizarre compile errors. @ text @$NetBSD$ Set cpp and use -traditional when invoking nasd_rpcgen. --- kernel_generate/dux/other/nasd/Makefile~ 2005-03-21 08:52:03.000000000 +0000 +++ kernel_generate/dux/other/nasd/Makefile @@@@ -61,7 +61,7 @@@@ IGROUP = bin IOWNER = bin NASD_RPCGEN_BIN = ../../../../../bin/nasd_rpcgen -NASD_RPCGEN = ${NASD_RPCGEN_BIN} -S_t +NASD_RPCGEN = ${NASD_RPCGEN_BIN} -S_t -C 'cpp -traditional' NASD_RPCGEN_INCLUDES = -I${MAKETOP}kernel/nasd/kernel_generate/dux -I${MAKETOP}kernel/nasd/kernel_generate/dux/other NASD_OPTIONS_H=${MAKETOP}kernel/nasd/include/nasd/nasd_options.h @ 1.1.2.1 log @file patch-kernel__generate_dux_other_nasd_Makefile was added on branch pkgsrc-2012Q1 on 2012-06-06 18:11:41 +0000 @ text @d1 15 @ 1.1.2.2 log @Pullup ticket #3823 - requested by dholland net/nasd: build fix Revisions pulled up: - net/nasd/distinfo 1.2 - net/nasd/patches/patch-al 1.2 - net/nasd/patches/patch-ay 1.2 - net/nasd/patches/patch-common_i386_Imakefile 1.1 - net/nasd/patches/patch-include_nasd_nasd__timer_h 1.1 - net/nasd/patches/patch-kernel__generate_dux_other_Makefile 1.1 - net/nasd/patches/patch-kernel__generate_dux_other_nasd_Makefile 1.1 --- Module Name: pkgsrc Committed By: dholland Date: Sat Jun 2 23:34:56 UTC 2012 Modified Files: pkgsrc/net/nasd: distinfo pkgsrc/net/nasd/patches: patch-al patch-ay Added Files: pkgsrc/net/nasd/patches: patch-common_i386_Imakefile patch-include_nasd_nasd__timer_h patch-kernel__generate_dux_other_Makefile patch-kernel__generate_dux_other_nasd_Makefile Log Message: Fix broken build. (1) With gcc 4.5, cpp does not fold lines separated by a escaped newline in the output. Therefore when nasd_rpcgen runs its rpc definitions through cpp, what comes out contains syntax errors. The parser then reports these with SIGSEGV. First fix the cpp plumbing to use the cpp tool wrapper during build, and then have it use -traditional. (2) On amd64, roughly half the build thinks it's actually i386. Patch the other half to agree. This may not turn out to work, but it does build instead of dumping out bizarre compile errors. @ text @a0 15 $NetBSD$ Set cpp and use -traditional when invoking nasd_rpcgen. --- kernel_generate/dux/other/nasd/Makefile~ 2005-03-21 08:52:03.000000000 +0000 +++ kernel_generate/dux/other/nasd/Makefile @@@@ -61,7 +61,7 @@@@ IGROUP = bin IOWNER = bin NASD_RPCGEN_BIN = ../../../../../bin/nasd_rpcgen -NASD_RPCGEN = ${NASD_RPCGEN_BIN} -S_t +NASD_RPCGEN = ${NASD_RPCGEN_BIN} -S_t -C 'cpp -traditional' NASD_RPCGEN_INCLUDES = -I${MAKETOP}kernel/nasd/kernel_generate/dux -I${MAKETOP}kernel/nasd/kernel_generate/dux/other NASD_OPTIONS_H=${MAKETOP}kernel/nasd/include/nasd/nasd_options.h @