From 6247aaa57cb7d077086c48c7fa40069d924e53bf Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Thu, 10 Aug 2017 21:53:19 -0400 Subject: [PATCH] Fix libqpdf.map and prevent future breakage The build now checks to make sure libqpdf.map has the right library version number in it. --- libqpdf.map | 2 +- libqpdf/build.mk | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/libqpdf.map b/libqpdf.map index ab23bd9a..548dcb4d 100644 --- a/libqpdf.map +++ b/libqpdf.map @@ -1,4 +1,4 @@ -LIBQPDF_10 { +LIBQPDF_17 { global: *; }; diff --git a/libqpdf/build.mk b/libqpdf/build.mk index 001d36c8..e8561128 100644 --- a/libqpdf/build.mk +++ b/libqpdf/build.mk @@ -94,5 +94,23 @@ $(COBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.c # # * Otherwise, increment REVISION -$(TARGETS_libqpdf): $(OBJS_libqpdf) - $(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),17,0,0) +CURRENT := 17 +REVISION := 0 +AGE := 0 +$(TARGETS_libqpdf): $(OBJS_libqpdf) libqpdf/$(OUTPUT_DIR)/checkmap_libqpdf-$(CURRENT).stamp + $(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),$(CURRENT),$(REVISION),$(AGE)) + +libqpdf/$(OUTPUT_DIR)/checkmap_libqpdf-$(CURRENT).stamp: libqpdf.map + @if [ $$(head -1 libqpdf.map | awk '{print $$1}') = LIBQPDF_$(CURRENT) ]; then \ + touch $@; \ + else \ + echo ''; \ + echo '****'; \ + echo libqpdf.map is out of date; \ + echo first line should contain LIBQPDF_$(CURRENT); \ + echo '****'; \ + echo ''; \ + rm -f $@; \ + false; \ + fi +