head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.30 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.28 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.26 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.24 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.22 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.20 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.18 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.16 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.14 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.12 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.10 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.8 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.6 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.4 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.2 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.2.0.92 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.90 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.88 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.86 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.84 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.82 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.80 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.78 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.74 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.54 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.76 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.72 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.70 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.68 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.66 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.64 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.62 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.60 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.58 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.56 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.52 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.50 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.48 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.46 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.44 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.42 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.40 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.38 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.36 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.34 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.32 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.30 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.28 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.26 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.24 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.22 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.20 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.18 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.16 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.14 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.12 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.10 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.8 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.6 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.2 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.1.0.16 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.14 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.12 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.10 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.8 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.6 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.4 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.2 pkgsrc-2009Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2022.07.28.09.12.45; author wiz; state Exp; branches; next 1.2; commitid VMQwfGWxoQnURDND; 1.2 date 2011.01.18.10.34.39; author markd; state Exp; branches; next 1.1; 1.1 date 2009.01.04.23.10.06; author dbj; state Exp; branches; next ; desc @@ 1.3 log @libvolume_id: add --tag to our local libtool patches @ text @$NetBSD: patch-ae,v 1.2 2011/01/18 10:34:39 markd Exp $ --- Makefile.orig 2007-12-26 16:52:36.000000000 -0800 +++ Makefile 2009-01-04 15:05:52.000000000 -0800 @@@@ -8,9 +8,9 @@@@ includedir = ${prefix}/include libdir = ${prefix}/lib usrlibdir = ${prefix}/lib -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_LIB = ${INSTALL} -m 755 +#INSTALL = /usr/bin/install -c +#INSTALL_DATA = ${INSTALL} -m 644 +#INSTALL_LIB = ${INSTALL} -m 755 SHLIB_CUR = 0 SHLIB_REV = 81 @@@@ -59,12 +59,19 @@@@ HEADERS= \ libvolume_id.h \ util.h -all: libvolume_id.a $(SHLIB) libvolume_id.pc +all: libvolume_id.la libvolume_id.pc .PHONY: all .DEFAULT: all .SUFFIXES: +libvolume_id.la: $(OBJS:.o=.lo) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@@ \ + $^ -version-info $(SHLIB_CUR):$(SHLIB_REV):$(SHLIB_AGE) -rpath $(PREFIX)/lib + +%.lo: %.c + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@@ $< + %.o: %.c $(E) " CC " $@@ $(Q) $(CC) -c $(CFLAGS) $< -o $@@ @@@@ -88,27 +95,22 @@@@ $(SHLIB): $(HEADERS) exported_symbols $( $(addprefix .shlib/,$(OBJS)) libvolume_id.pc: - $(E) " GENPC " $@@ - $(Q) echo "libdir=${usrlibdir}" >> $@@ - $(Q) echo "includedir=${includedir}" >> $@@ - $(Q) echo "" >> $@@ - $(Q) echo "Name: libvolume_id" >> $@@ - $(Q) echo "Description: Filesystem label and uuid access" >> $@@ - $(Q) echo "Version: $(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)" >> $@@ - $(Q) echo "Libs: -L\$${libdir} -lvolume_id" >> $@@ - $(Q) echo "Cflags: -I\$${includedir}" >> $@@ + echo "prefix=$(PREFIX)" >> $@@ + echo "exec_prefix=\$${prefix}" >> $@@ + echo "libdir=\$${exec_prefix}/lib" >> $@@ + echo "includedir=\$${exec_prefix}/include" >> $@@ + echo "" >> $@@ + echo "Name: libvolume_id" >> $@@ + echo "Description: Filesystem label and uuid access" >> $@@ + echo "Version: $(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)" >> $@@ + echo "" >> $@@ + echo "Libs: -L\$${libdir} -lvolume_id" >> $@@ + echo "Cflags: -I\$${includedir}" >> $@@ install: all - $(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h - $(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB) - mkdir -p $(DESTDIR)$(usrlibdir)/ - ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR) -ifeq ($(libdir),$(usrlibdir)) - ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so -else - ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so -endif - $(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc + $(LIBTOOL) --mode=install $(INSTALL_LIB) libvolume_id.la $(DESTDIR)$(PREFIX)/lib + $(INSTALL_DATA) libvolume_id.h $(DESTDIR)$(PREFIX)/include + $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig .PHONY: install uninstall: @ 1.2 log @Pass in INSTALL_{DATA,LIB} to make rather than hardcoding path of install. Fixes install on Arch Linux. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2009/01/04 23:10:06 dbj Exp $ d30 1 a30 1 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o $@@ \ d34 1 a34 1 + $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -o $@@ $< @ 1.1 log @convert to use libtool additional fixes to compile on osx @ text @d1 1 a1 1 $NetBSD: $ d5 13 @