[S] Change in libgtpnl[master]: configure: regular_C(PP)FLAGS -> C(PP)FLAGS

2023-10-20 Thread laforge 
laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email )

Change subject: configure: regular_C(PP)FLAGS -> C(PP)FLAGS
..

configure: regular_C(PP)FLAGS -> C(PP)FLAGS

Make it consistent with other Osmocom projects by removing special
naming for CFLAGS and CPPFLAGS. Otherwise the arguments we typically
add, such as --enable-sanitize which is already there, or
--enable-werror which I'll add in the next patch, do not work without
further changes.

Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
---
M Make_global.am
M configure.ac
2 files changed, 24 insertions(+), 8 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve




diff --git a/Make_global.am b/Make_global.am
index f2cb36c..9a3d5b2 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -1,2 +1,2 @@
-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
+AM_CPPFLAGS = ${CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS}
+AM_CFLAGS = ${CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
diff --git a/configure.ac b/configure.ac
index eb35f57..e7d9888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,11 @@
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign tar-pax no-dist-gzip dist-bzip2 1.6 subdir-objects])

+CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT"
+CFLAGS="$CFLAGS -Wall -Waggregate-return -Wmissing-declarations \
+   -Wmissing-prototypes -Wshadow -Wstrict-prototypes \
+   -Wformat=2 -pipe"
+
 dnl include release helper
 RELMAKE='-include osmo-release.mk'
 AC_SUBST([RELMAKE])
@@ -48,12 +53,8 @@
CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
 fi

-regular_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT"
-regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
-   -Wmissing-prototypes -Wshadow -Wstrict-prototypes \
-   -Wformat=2 -pipe"
-AC_SUBST([regular_CPPFLAGS])
-AC_SUBST([regular_CFLAGS])
+AC_SUBST([CPPFLAGS])
+AC_SUBST([CFLAGS])
 AC_CONFIG_FILES([Makefile src/Makefile include/Makefile 
include/libgtpnl/Makefile include/linux/Makefile tools/Makefile libgtpnl.pc])
 AC_OUTPUT(
contrib/libgtpnl.spec)

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
Gerrit-Change-Number: 34826
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in libgtpnl[master]: configure: regular_C(PP)FLAGS -> C(PP)FLAGS

2023-10-20 Thread laforge 
Attention is currently required from: osmith.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email )

Change subject: configure: regular_C(PP)FLAGS -> C(PP)FLAGS
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
Gerrit-Change-Number: 34826
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Fri, 20 Oct 2023 20:49:05 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: configure: regular_C(PP)FLAGS -> C(PP)FLAGS

2023-10-19 Thread pespin 
Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email )

Change subject: configure: regular_C(PP)FLAGS -> C(PP)FLAGS
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
Gerrit-Change-Number: 34826
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:22:20 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: configure: regular_C(PP)FLAGS -> C(PP)FLAGS

2023-10-19 Thread osmith 
osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email )


Change subject: configure: regular_C(PP)FLAGS -> C(PP)FLAGS
..

configure: regular_C(PP)FLAGS -> C(PP)FLAGS

Make it consistent with other Osmocom projects by removing special
naming for CFLAGS and CPPFLAGS. Otherwise the arguments we typically
add, such as --enable-sanitize which is already there, or
--enable-werror which I'll add in the next patch, do not work without
further changes.

Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
---
M Make_global.am
M configure.ac
2 files changed, 24 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/26/34826/1

diff --git a/Make_global.am b/Make_global.am
index f2cb36c..9a3d5b2 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -1,2 +1,2 @@
-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
+AM_CPPFLAGS = ${CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS}
+AM_CFLAGS = ${CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
diff --git a/configure.ac b/configure.ac
index eb35f57..e7d9888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,11 @@
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign tar-pax no-dist-gzip dist-bzip2 1.6 subdir-objects])

+CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT"
+CFLAGS="$CFLAGS -Wall -Waggregate-return -Wmissing-declarations \
+   -Wmissing-prototypes -Wshadow -Wstrict-prototypes \
+   -Wformat=2 -pipe"
+
 dnl include release helper
 RELMAKE='-include osmo-release.mk'
 AC_SUBST([RELMAKE])
@@ -48,12 +53,8 @@
CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
 fi

-regular_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT"
-regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
-   -Wmissing-prototypes -Wshadow -Wstrict-prototypes \
-   -Wformat=2 -pipe"
-AC_SUBST([regular_CPPFLAGS])
-AC_SUBST([regular_CFLAGS])
+AC_SUBST([CPPFLAGS])
+AC_SUBST([CFLAGS])
 AC_CONFIG_FILES([Makefile src/Makefile include/Makefile 
include/libgtpnl/Makefile include/linux/Makefile tools/Makefile libgtpnl.pc])
 AC_OUTPUT(
contrib/libgtpnl.spec)

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
Gerrit-Change-Number: 34826
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange