mirror of
https://git.freebsd.org/ports.git
synced 2025-05-02 11:36:40 -04:00
75fd3e7e79
Add LICENSE, regerate multiple patches, reorder variables, etc. Accumulated ChangeLog: Version 5.6.4 (12/24/2020): * Fixed shared libary creation. Thanks to @ffontaine and Alex Suykov. * Fixed one more pointer arithmetic issue. Thanks to aitap. * Better configuring of the pointer arithmetic type. * Fixed strndup macro detection... Again. Thanks to SkyOnce. Version 5.6.3 (12/23/2020): * Fixed missing dmallocc.o <- dmalloc.h dependency. Thanks to @ffontaine. * Fixed more %p usage and issues around pointer arithmetic. Thanks to aitap. Version 5.6.2 (12/17/2020): * Fixed bug with loc_snprintf use of va_args. Thanks much to aitap. * Handle strndup being a macro. Thanks much to aitap. * Renmaed the ERROR_ and DEBUG_ defines to DMALLOC_* to reduce OS overlap. * Fixed issues with cross-compiling and getpagesize. Thanks to aitap. * Fixed problems with cross-compiling and printing of pointers. Thanks to aitap. Version 5.6.1 (11/24/2020): * Fixed the installdocs target. Thanks to matthewluckie. Version 5.6.0 (11/22/2020): * Implemented a snprintf to [hopefully] stop recursion. Thanks to drok. * Added append_string and friends for better string output. * Fixed strndup handling when it is a macro. Thanks to danielgora. * Fixed strndup configuration and handling in general. * Added better getenv handling. * Fixed issues around page-size detection and heap extension. * Added circleci to github. * Improved the test program output. * Added strnlen configuration and handling. * Moved to git on April 9, 2018. PR: 252124 Submitted by: mjl@luckie.org.nz (maintainer)
105 lines
3.7 KiB
Text
105 lines
3.7 KiB
Text
--- Makefile.in.orig 2020-12-28 20:55:00 UTC
|
|
+++ Makefile.in
|
|
@@ -14,6 +14,7 @@ bindir = @bindir@
|
|
libdir = @libdir@
|
|
shlibdir = @shlibdir@
|
|
includedir = @includedir@
|
|
+infodir = @infodir@
|
|
docdir = $(prefix)/share/doc/$(MODULE)
|
|
|
|
# default c-compiler
|
|
@@ -42,7 +43,7 @@ LIBRARY = lib$(MODULE).a
|
|
|
|
# thread version of the library
|
|
LIB_TH = lib$(MODULE)th.a
|
|
-LIB_TH_SL = lib$(MODULE)th.@shlibext@
|
|
+LIB_TH_SL = lib$(MODULE)th.@shlibext@.1
|
|
@TH_ON@BUILD_ALL_1 = threads
|
|
@TH_ON@INSTALL_LIB_1 = installth
|
|
@SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
|
|
@@ -52,7 +53,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@
|
|
|
|
# C++ version of the library
|
|
LIB_CXX = lib$(MODULE)xx.a
|
|
-LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
|
|
+LIB_CXX_SL = lib$(MODULE)xx.@shlibext@.1
|
|
@CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
|
|
@CXX_ON@INSTALL_LIB_3 = installcxx
|
|
@SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
|
|
@@ -62,7 +63,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
|
|
|
|
# threads + C++
|
|
LIB_TH_CXX = lib$(MODULE)thcxx.a
|
|
-LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
|
|
+LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@.1
|
|
@TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
|
|
@TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
|
|
@TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
|
|
@@ -77,7 +78,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
|
|
@CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
|
|
|
|
# shared versions of the libraries
|
|
-LIB_SL = lib$(MODULE).@shlibext@
|
|
+LIB_SL = lib$(MODULE).@shlibext@.1
|
|
@SL_ON@BUILD_ALL_7 = $(LIB_SL)
|
|
@SL_ON@INSTALL_LIB_7 = installsl
|
|
@SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
|
|
@@ -226,7 +227,6 @@ installsl : $(LIB_SL)
|
|
installlib : $(INSTALL_LIB)
|
|
$(srcdir)/mkinstalldirs $(libdir)
|
|
$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
|
|
- @RANLIB@ $(libdir)/$(LIBRARY)
|
|
@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
|
|
@CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library"
|
|
@TH_OFF@ @echo "Enter 'make installth' to install thread library"
|
|
@@ -236,7 +236,7 @@ installdocs : $(INSTALL_FILE2) $(HTML_FILE2) $(INFO_FI
|
|
$(srcdir)/mkinstalldirs $(docdir)
|
|
$(INSTALL_DATA) $(INSTALL_FILE2) $(docdir)/$(INSTALL_FILE)
|
|
$(INSTALL_DATA) $(HTML_FILE2) $(docdir)/$(HTML_FILE)
|
|
- $(INSTALL_DATA) $(INFO_FILE) $(docdir)
|
|
+ $(INSTALL_DATA) $(INFO_FILE) $(infodir)
|
|
|
|
install : installincs installlib $(UTIL)
|
|
$(srcdir)/mkinstalldirs $(bindir)
|
|
@@ -259,13 +259,13 @@ dmalloc.h : $(srcdir)/dmalloc.h.1 dmalloc.h.2 $(srcdir
|
|
|
|
$(INFO_FILE) : $(srcdir)/$(TEXI_FILE)
|
|
rm -f $@ $@.t
|
|
- makeinfo -o $@.t --fill-column=100 --no-split $<
|
|
+ makeinfo -o $@.t --fill-column=100 --no-split $(srcdir)/$(TEXI_FILE)
|
|
mv $@.t $@
|
|
|
|
# we need the FILE2 this because make gets confused by ../dmalloc.html
|
|
$(HTML_FILE) $(HTML_FILE2) : $(srcdir)/$(TEXI_FILE)
|
|
rm -f $@ $@.t
|
|
- texi2html --output=$@.t -number -monolithic $<
|
|
+ texi2html --output=$@.t $(srcdir)/$(TEXI_FILE)
|
|
mv $@.t $@
|
|
|
|
# we need the FILE2 this because make gets confused by ../INSTALL.txt
|
|
@@ -353,8 +353,7 @@ utils : $(UTIL)
|
|
|
|
$(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o append.o
|
|
rm -f $@
|
|
- $(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
|
|
- mv $(A_OUT) $@
|
|
+ $(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
|
|
|
|
# special _th versions of objects with the LOCK_THREADS variable defined to 1
|
|
chunk_th.o : $(srcdir)/chunk.c
|
|
@@ -373,13 +372,11 @@ tests : $(TEST) $(TEST_FC)
|
|
|
|
$(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)
|
|
rm -f $@
|
|
- $(CC) $(LDFLAGS) -o $(A_OUT) $(TEST).o dmalloc_argv.o $(LIBRARY)
|
|
- mv $(A_OUT) $@
|
|
+ $(CC) $(LDFLAGS) -o $@ $(TEST).o dmalloc_argv.o $(LIBRARY)
|
|
|
|
$(TEST_FC) : $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
|
|
rm -f $@
|
|
- $(CC) $(LDFLAGS) -o $(A_OUT) $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
|
|
- mv $(A_OUT) $@
|
|
+ $(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
|
|
|
|
check : $(TEST) $(TEST_FC)
|
|
./$(TEST_FC) -s
|