about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-10-13 00:37:52 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-10-13 00:37:52 +0000
commit24c3f43ad38abb1d860edd25838a5b56825fb6dc (patch)
treeda40c42a1933158c676708df71eb0570b14d3c64
parente1563123f61b7dcb9d7b6e9bd6a6e845fcb65d55 (diff)
downloadnetpbm-mirror-24c3f43ad38abb1d860edd25838a5b56825fb6dc.tar.gz
netpbm-mirror-24c3f43ad38abb1d860edd25838a5b56825fb6dc.tar.xz
netpbm-mirror-24c3f43ad38abb1d860edd25838a5b56825fb6dc.zip
Fix missing -DNDEBUG compile option
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4754 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/jpeg2000/libjasper/common.mk3
-rw-r--r--doc/HISTORY3
2 files changed, 4 insertions, 2 deletions
diff --git a/converter/other/jpeg2000/libjasper/common.mk b/converter/other/jpeg2000/libjasper/common.mk
index a333f5d6..194ce3c1 100644
--- a/converter/other/jpeg2000/libjasper/common.mk
+++ b/converter/other/jpeg2000/libjasper/common.mk
@@ -24,8 +24,7 @@ INCLUDES := -I$(JASPERSRCDIR)/include $(INCLUDES)
 DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STDDEF_H=1 -DEXCLUDE_BMP_SUPPORT -DEXCLUDE_RAS_SUPPORT -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT -DEXCLUDE_PNM_SUPPORT
 
 $(LIB_OBJECTS):%.o:%.c
-	$(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) \
-	  $(CFLAGS_PERSONAL) $(CADD) $<
+	$(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS_ALL) $<
 
 $(LIB_OBJECTS): importinc
 
diff --git a/doc/HISTORY b/doc/HISTORY
index 8af23841..16d540ba 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -26,6 +26,9 @@ not yet  BJH  Release 11.05.00
               Build: Fix compile error on systems without 'asprintf'.
               Introduced in Netpbm 11.04 (September 2023).
 
+              Build: Fix building of jpeg2ktopam and pamtojpeg2k with
+              assertion checking by default.
+
 23.09.27 BJH  Release 11.04.00
 
               pamaddnoise: add -salt.