Merge pull request uniconproject#437 from Jafaral/debugall

config: improve debug options/reporting, strip, musl

Author: Don-Ward

.github/workflows/build.yml

@@ -207,7 +207,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Configure
-      run: ./configure CFLAGS=-fno-pie LDFLAGS=-no-pie --disable-iconc
+      run: ./configure --disable-iconc
       shell: alpine.sh {0}
 
     - name: Make

Makedefs.in

@@ -40,9 +40,6 @@ LIBTP=libtp
 # Do we want to build iconc? If so, set to Iconc
 ICONCTARGET=@ICONCTARGET@
 
-# with strip
-DASHX=@DASHX@
-
 # If graphics is enabled
 GRAPHICS= @GRAPHICS@
 XL= @XL@
@@ -77,6 +74,8 @@ MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 RANLIB = ranlib
 
+STRIP=@STRIP@
+
 UNICONX=@UNICONX@
 UNICONWX=@UNICONWX@
 UNICONC=@UNICONC@

configure

@@ -627,8 +627,8 @@ GL_LDFLAGS
 GL_CFLAGS
 JV_LDFLAGS
 PLUGINS
+STRIP
 DASHG
-DASHX
 DASHS
 SLNT
 CMNT
@@ -2977,29 +2977,40 @@ unicon_osrel=$OSREL
 case $host_os in
      *linux*)
         unicon_os="linux"
-
-	# if dist/version are not set, try to guess them
-	if test x$unicon_osdist = x ; then
-	   if test -f /etc/os-release ; then
-	      . /etc/os-release
-	      unicon_osdist=$NAME
-	      unicon_osrel=$VERSION_ID
-	   elif type lsb_release >/dev/null 2>&1; then
-	      unicon_osdist=$(lsb_release -si)
-	      unicon_osrel=$(lsb_release -sr)
-	   elif test -f /etc/lsb-release ; then
-	      . /etc/lsb-release
-	      unicon_osdist=$DISTRIB_ID
-	      unicon_osrel=$DISTRIB_RELEASE
-	   elif test -f /etc/debian_version ; then
-	      unicon_osdist=Debian
-	      unicon_osrel=$(cat /etc/debian_version)
-	   fi
-	fi
+        # if dist/version are not set, try to guess them
+        if test x$unicon_osdist = x ; then
+            if test -f /etc/os-release ; then
+               . /etc/os-release
+               unicon_osdist=$NAME
+               unicon_osrel=$VERSION_ID
+            elif type lsb_release >/dev/null 2>&1; then
+               unicon_osdist=$(lsb_release -si)
+               unicon_osrel=$(lsb_release -sr)
+            elif test -f /etc/lsb-release ; then
+               . /etc/lsb-release
+               unicon_osdist=$DISTRIB_ID
+               unicon_osrel=$DISTRIB_RELEASE
+            elif test -f /etc/debian_version ; then
+               unicon_osdist=Debian
+               unicon_osrel=$(cat /etc/debian_version)
+            fi
+        fi
 
 
 $as_echo "#define UNIX 1" >>confdefs.h
 
+
+        case $host_os in
+           *musl*)
+
+$as_echo "#define __MUSL__ 1" >>confdefs.h
+
+            MUSLFLG="-D__MUSL__"
+            CFLAGS="-fno-pie $CFLAGS"
+            LDFLAGS=" -no-pie $LDFLAGS"
+            ;;
+         esac
+
         ;;
      *solaris*)
         unicon_os="solaris"
@@ -3020,7 +3031,7 @@ $as_echo "#define UNIX 1" >>confdefs.h
 
         ;;
      *bsd*)
-       # freebsd for now
+        # freebsd for now
         unicon_os="freebsd"
 
 $as_echo "#define UNIX 1" >>confdefs.h
@@ -3200,6 +3211,7 @@ else
   thin=no
 fi
 
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; debug=yes
@@ -3223,11 +3235,12 @@ fi
 
 # Check whether --enable-devmode was given.
 if test "${enable_devmode+set}" = set; then :
-  enableval=$enable_devmode; devmode=yes
+  enableval=$enable_devmode; devmode=$enableval
 else
   devmode=no
 fi
 
+
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; werror=yes
@@ -3242,6 +3255,7 @@ else
   warn=no
 fi
 
+
 # Check whether --enable-uniconx was given.
 if test "${enable_uniconx+set}" = set; then :
   enableval=$enable_uniconx; uniconx=yes
@@ -4741,24 +4755,30 @@ else
   UNICONWT=wicont
 fi
 
-if test x"$devmode" = x"yes" ; then
+if test x"$devmode" = x"yes" || test x"$devmode" = x"all"; then
   debug=yes
   warn=yes
 
 $as_echo "#define DEVELOPMODE 1" >>confdefs.h
 
+  if test x"$devmode" = x"all"; then
+   debugheap=yes
+   verifyheap=yes
+  fi
 fi
 
 if test x"$debugheap" = x"yes" ; then
 
 $as_echo "#define DebugHeap 1" >>confdefs.h
 
+  debugheapreport="DebugHeap"
 fi
 
 if test x"$verifyheap" = x"yes" ; then
 
 $as_echo "#define VerifyHeap 1" >>confdefs.h
 
+    verifyheapreport="VerifyHeap"
 fi
 
 if test x"$udbtools" = x"yes" ; then
@@ -7022,7 +7042,7 @@ esac
 
 OBJ=o
 CFUNCTARGET="cfun"
-CFDYN="-fPIC "
+CFDYN="-fPIC $MUSLFLG "
 LDDYN="-shared "
 SO=so
 # OS specific flags go here
@@ -7042,7 +7062,6 @@ case $unicon_host in
         ;;
      *macos*)
        LDDYN="-Xlinker -undefined -Xlinker dynamic_lookup -shared "
-       DASHX=-x
        RLIBS="-ldl "
 	;;
      *windows*)
@@ -7080,11 +7099,16 @@ if test "x$iconc" = "xyes" || test "x$iconc" = "xon" ; then
        ICONCTARGET=Iconc
 fi
 
-
 if test "x$orig_cflags" != "x" ; then
   CFLAGS="$CFLAGS $orig_cflags"
 fi
 
+if test x"$debug" = x"yes" ; then
+  STRIP="@\#strip"
+else
+  STRIP=strip
+fi
+
 
 
 
@@ -17122,9 +17146,11 @@ LDFLAGS  :$LDFLAGS
 LIBS     : $LIBS
 CXX      :  $CXX  (Required only with FTGL and VOIP)
 CXXFLAGS : $CXXFLAGS
-prefix	 :  $prefix
+CFDYN    : $CFDYN
+LDDYN    : $LDDYN
+prefix   :  $prefix
 Verbose  :  $verbosebuild
-Debug    :  $debug
+Debug    :  $debug $debugheapreport $verifyheapreport
 Warnings :  $warn
 Werror   :  $werror
 Devmode  :  $devmode