build: Add -g to CFLAGS (upstream --with-debug doesn't)

2 files changed, 10 insertions, 2 deletions

diff --git a/build b/build
index 844e5e8..cf85f88 100755
--- a/build
+++ b/build
@@ -5,6 +5,7 @@ include ../source.mk
 builddir = obj_$$(printf '%s' $@ | sed 's/^[^_]*_//')
 abi_ver = $$(printf '%s\n' '$(OPK_SOURCE_VERSION_UPSTREAM)' | sed 's/[.].*//')
 legacy_abi_ver = $$(($(abi_ver) - 1))
+CFLAGS = -Os -g
 common_opts = \
 	--without-ada \
 	--without-tests \
@@ -13,7 +14,7 @@ common_opts = \
 	--with-install-prefix="$${PWD}/dest" \
 	--with-shared \
 	--with-cxx-shared \
-	--with-debug \
+	--without-debug \
 	--without-profile \
 	--with-termlib=tinfo \
 	--with-ticlib=tic \
@@ -38,7 +39,7 @@ nop:
 	@:
 
 build_ncurses build_ncursesw build_ncurses_legacy build_ncursesw_legacy:
-	oh-autoconfigure -B $(builddir) -- $($@_opts)
+	CFLAGS='$(CFLAGS)' oh-autoconfigure -B $(builddir) -- $($@_opts)
 	oh-autobuild -B $(builddir)
 	touch $@
 
diff --git a/changelog b/changelog
index 661a1d9..0760348 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+ncurses (6.1+20190630-2) trunk
+
+  * ncurses-dbg: Actually include debugging symbols (normally always excluded
+    from the shared libraries by upstream).
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sat, 06 Jul 2019 16:24:35 -0400
+
 ncurses (6.1+20190630-1) trunk
 
   * New upstream version.