Skip to content

Commit

Permalink
Merge pull request #97 from antoinemine/fix/strip
Browse files Browse the repository at this point in the history
Use strip --strip-unneeded for stripping.
  • Loading branch information
antoinemine authored Apr 11, 2024
2 parents 1745bd5 + f3749ab commit 4563122
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion apron/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ install: all
mkdir -p $(APRON_INCLUDE)
cp $(H_FILES) $(APRON_INCLUDE)
mkdir -p $(APRON_LIB)
for i in $(LIB_FILES); do if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; done
for i in $(LIB_FILES); do if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; done
ifneq ($(HAS_DEBUG),)
for i in $(LIB_FILES_DEBUG); do if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; done
endif
Expand Down
4 changes: 3 additions & 1 deletion apronxx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ distclean: clean
install:
$(INSTALLd) $(APRON_INCLUDE) $(APRON_INCLUDE)/apronxx $(APRON_LIB)
$(INSTALL) $(CCINC) $(APRON_INCLUDE)/apronxx
$(INSTALLSTRIP) $(CCLIB_TO_INSTALL) $(APRON_LIB)
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifneq ($(HAS_DEBUG),)
$(INSTALL) $(CCLIB_TO_INSTALL_DEBUG) $(APRON_LIB)
endif
Expand Down
4 changes: 2 additions & 2 deletions avoct/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ install:
$(INSTALL) avo.h $(APRON_INCLUDE)
$(INSTALL) $(CCINC) $(APRON_INCLUDE)/avo
for i in avotop* avorun*; do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_BIN); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_BIN); $(STRIP) $(APRON_BIN)/$$i; fi; \
done
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifeq ($(OCAMLFIND),)
for i in $(CAMLLIB_TO_INSTALL); do \
Expand Down
2 changes: 1 addition & 1 deletion box/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ install: $(CCINC_TO_INSTALL) $(CCLIB_TO_INSTALL)
$(INSTALLd) $(APRON_INCLUDE) $(APRON_LIB)
$(INSTALL) $(CCINC_TO_INSTALL) $(APRON_INCLUDE)
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifeq ($(OCAMLFIND),)
for i in $(CAML_TO_INSTALL); do \
Expand Down
9 changes: 5 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ has_java=1
force_absolute_dylib_install_names=0;
ext_dll=so
has_debug=0
do_strip=--strip
strip="strip --strip-unneeded"
while : ; do
case "$1" in
"")
Expand Down Expand Up @@ -126,7 +126,7 @@ while : ; do
-debug|--debug)
has_debug=1;;
-no-strip|--no-strip)
do_strip=;;
strip=echo;;
-help|--help)
help;;
*)
Expand Down Expand Up @@ -616,7 +616,8 @@ detected configuration:
installation path $apron_prefix
dynamic libraries extension $ext_dll
install (stripped) command $install ($do_strip)
install command $install
strip command $strip
EOF

Expand Down Expand Up @@ -694,7 +695,7 @@ RANLIB = $ranlib
SED = $sed
PERL = perl
INSTALL = $install
INSTALLSTRIP = $install $do_strip
STRIP = $strip
INSTALLd = $install -d
CAML_PREFIX = $caml_prefix
Expand Down
4 changes: 2 additions & 2 deletions fppol/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ install:
$(INSTALL) fpp.h $(APRON_INCLUDE)
$(INSTALL) $(CCINC) $(APRON_INCLUDE)/fpp
for i in fpptop* fpprun*; do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_BIN); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_BIN); $(STRIP) $(APRON_BIN)/$$i; fi; \
done
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifeq ($(OCAMLFIND),)
for i in $(CAMLLIB_TO_INSTALL); do \
Expand Down
4 changes: 2 additions & 2 deletions itv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ install: $(CCINC_TO_INSTALL) $(CCLIB_TO_INSTALL)
$(INSTALLd) $(APRON_INCLUDE) $(APRON_LIB)
$(INSTALL) $(CCINC_TO_INSTALL) $(APRON_INCLUDE)
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
# for i in $(CCBIN_TO_INSTALL); do \
# if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_BIN); fi; \
# if test -f $$i; then $(INSTALL) $$i $(APRON_BIN); $(STRIP) $(APRON_BIN)/$$i; fi; \
# done
ifneq ($(HAS_DEBUG),)
for i in $(CCLIB_TO_INSTALL_DEBUG); do \
Expand Down
2 changes: 1 addition & 1 deletion japron/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ doc:
install:
$(INSTALLd) $(APRON_LIB); \
for i in $(SOINST); do \
$(INSTALLSTRIP) $$i $(APRON_LIB); \
$(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; \
done; \
$(INSTALLd) $(JAVA_PREFIX); \
for i in $(JAVAINST); do \
Expand Down
2 changes: 1 addition & 1 deletion newpolka/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ install:
$(INSTALLd) $(APRON_INCLUDE) $(APRON_LIB)
$(INSTALL) $(CCINC_TO_INSTALL) $(APRON_INCLUDE)
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifeq ($(OCAMLFIND),)
for i in $(CAML_TO_INSTALL); do \
Expand Down
4 changes: 2 additions & 2 deletions octagons/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ install:
$(INSTALL) oct.h $(APRON_INCLUDE)
$(INSTALL) $(CCINC) $(APRON_INCLUDE)/oct
for i in octtop* octrun*; do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_BIN); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_BIN); $(STRIP) $(APRON_BIN)/$$i; fi; \
done
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifeq ($(OCAMLFIND),)
for i in $(CAMLLIB_TO_INSTAL); do \
Expand Down
2 changes: 1 addition & 1 deletion ppl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ install:
$(INSTALLd) $(APRON_INCLUDE) $(APRON_LIB) $(APRON_BIN)
$(INSTALL) ap_ppl.h $(APRON_INCLUDE)
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifneq ($(HAS_OCAML),)
ifeq ($(OCAMLFIND),)
Expand Down
2 changes: 1 addition & 1 deletion pplite/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ install:
$(INSTALLd) $(APRON_INCLUDE) $(APRON_LIB) $(APRON_BIN)
$(INSTALL) ap_pplite.h $(APRON_INCLUDE)
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifeq ($(OCAMLFIND),)
for i in $(CAMLLIB_TO_INSTALL); do \
Expand Down
2 changes: 1 addition & 1 deletion products/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ install:
$(INSTALLd) $(APRON_INCLUDE) $(APRON_LIB)
$(INSTALL) $(CCINC_TO_INSTALL) $(APRON_INCLUDE)
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifeq ($(OCAMLFIND),)
for i in $(CAMLLIB_TO_INSTALL); do \
Expand Down
2 changes: 1 addition & 1 deletion taylor1plus/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ install: $(CCINC_TO_INSTALL) $(CCLIB_TO_INSTALL)
$(INSTALLd) $(APRON_INCLUDE) $(APRON_LIB)
$(INSTALL) $(CCINC_TO_INSTALL) $(APRON_INCLUDE)
for i in $(CCLIB_TO_INSTALL); do \
if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); $(STRIP) $(APRON_LIB)/$$i; fi; \
done
ifeq ($(OCAMLFIND),)
for i in $(CAML_TO_INSTALL); do \
Expand Down

0 comments on commit 4563122

Please sign in to comment.