head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.28 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.26 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.24 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.22 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.20 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.18 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.16 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.14 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.12 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.10 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.8 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.6 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.4 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.2 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.3.0.2 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.2.0.108 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.106 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.104 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.102 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.100 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.98 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.96 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.94 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.90 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.70 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.92 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.88 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.86 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.84 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.82 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.80 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.78 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.76 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.74 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.72 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.68 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.66 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.64 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.62 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.60 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.58 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.56 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.54 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.52 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.50 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.48 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.46 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.44 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.42 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.40 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.38 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.36 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.34 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.32 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.30 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.28 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.26 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.24 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.22 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.20 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.18 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.16 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.14 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.12 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.10 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.8 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.6 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.4 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.2 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.1.0.36 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.34 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.32 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.30 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.28 pkgsrc-2008Q1:1.1.0.26 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.24 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.22 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.20 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.18 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.16 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.14 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.12 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.10 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.8 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.6 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.4 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.2 pkgsrc-2005Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2022.12.21.13.19.30; author wiz; state Exp; branches; next 1.3; commitid pz188r4PJZ7xxq6E; 1.3 date 2022.09.23.12.22.39; author nia; state Exp; branches; next 1.2; commitid c71mmD4SI3kP4ZUD; 1.2 date 2009.02.16.18.25.20; author joerg; state Exp; branches; next 1.1; 1.1 date 2005.02.05.16.27.39; author zuntum; state Exp; branches; next ; desc @@ 1.4 log @oe2mbx: add explicit rule for src/liboe.o Hopefully fixes build on NetBSD 9; still builds on -current. @ text @$NetBSD: patch-aa,v 1.3 2022/09/23 12:22:39 nia Exp $ --- makefile.orig 2000-06-17 15:30:36.000000000 +0000 +++ makefile @@@@ -1,22 +1,29 @@@@ # MAKEFILE FOR LIBOE AND OE2MBX # Read README for info -PREFIX = /usr +PREFIX ?= /usr LIBDIR = $(PREFIX)/lib BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -oe2mbx : src/oe2mbx.c lib/liboe.o - gcc src/oe2mbx.c lib/liboe.o -o bin/oe2mbx -dynamic : src/oe2mbx.c - gcc src/oe2mbx.c -DDYNAMIC -o bin/oe2mbx -loe -liboe : src/liboe.c - gcc -c src/liboe.c -o lib/liboe.so +oe2mbx : src/oe2mbx.o lib/liboe.o + $(CC) $(LDFLAGS) src/oe2mbx.o lib/liboe.o -o bin/oe2mbx +dynamic : src/oe2mbx.o + $(CC) $(LDFLAGS) src/oe2mbx.o -DDYNAMIC -o bin/oe2mbx -loe +liboe : src/liboe.o + $(CC) $(LDFLAGS) -shared src/liboe.o -o lib/liboe.so + +src/oe2mbx.o : src/oe2mbx.c + $(CC) $(CFLAGS) -c src/oe2mbx.c -o src/oe2mbx.o + +src/liboe.o : src/liboe.c + $(CC) $(CFLAGS) -c src/liboe.c -o src/liboe.o + lib/liboe.o : src/liboe.c - gcc -c src/liboe.c -o lib/liboe.o + $(CC) $(CFLAGS) -c src/liboe.c -o lib/liboe.o install : - test -e bin/* && install bin/* $(BINDIR) && echo oe2mbx binary installed || echo oe2mbx binary not prepared - test -e lib/*.so && install lib/*.so $(LIBDIR) && install src/*.h $(INCLUDEDIR) && echo liboe library installed || echo liboe library not prepared + test -r bin/* && ${INSTALL_PROGRAM} bin/* ${DESTDIR}$(BINDIR) && echo oe2mbx binary installed || echo oe2mbx binary not prepared + test -r lib/*.so && ${INSTALL_LIB} lib/*.so ${DESTDIR}$(LIBDIR) && ${INSTALL_DATA} src/*.h ${DESTDIR}$(INCLUDEDIR) && echo liboe library installed || echo liboe library not prepared clean : - test -e bin/* && rm -f bin/* || test . - test -e lib/* && rm -f lib/* || test . + test -r bin/* && rm -f bin/* || test . + test -r lib/* && rm -f lib/* || test . @ 1.3 log @oe2mbx: Properly separate linking and compilation stages to fix RELRO builds. TODO: libtoolize (but I kept running into some ".ila does not exist" error) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2009/02/16 18:25:20 joerg Exp $ d5 1 a5 1 @@@@ -1,22 +1,26 @@@@ d31 3 @ 1.2 log @DESTDIR support. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/02/05 16:27:39 zuntum Exp $ d3 1 a3 1 --- makefile.orig Sat Jun 17 17:30:36 2000 d5 1 a5 1 @@@@ -1,22 +1,22 @@@@ d15 1 a15 1 oe2mbx : src/oe2mbx.c lib/liboe.o d17 1 a17 2 + $(CC) $(CFLAGS) src/oe2mbx.c lib/liboe.o -o bin/oe2mbx dynamic : src/oe2mbx.c d19 1 a19 2 + $(CC) $(CFLAGS) src/oe2mbx.c -DDYNAMIC -o bin/oe2mbx -loe liboe : src/liboe.c d21 10 a30 1 + $(CC) $(CFLAGS) -c src/liboe.c -o lib/liboe.so @ 1.1 log @Fix PR#28775 by Georg Schwarz : improve portability: - use "test -r" instead of "test -e" - use ${INSTALL_*} @ text @d1 1 a1 1 $NetBSD$ d30 2 a31 2 + test -r bin/* && ${INSTALL_PROGRAM} bin/* $(BINDIR) && echo oe2mbx binary installed || echo oe2mbx binary not prepared + test -r lib/*.so && ${INSTALL_LIB} lib/*.so $(LIBDIR) && ${INSTALL_DATA} src/*.h $(INCLUDEDIR) && echo liboe library installed || echo liboe library not prepared @