| Patrick Williams | 2390b1b | 2022-11-03 13:47:49 -0500 | [diff] [blame^] | 1 | From e5ddcf9575437bacd64c2b68501b413014186a6a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 19 Oct 2022 10:15:01 -0700 |
| 4 | Subject: [PATCH] makedefs: Account for linux 6.x version |
| 5 | |
| 6 | Major version has bumped to 6 and script needs to know that |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | makedefs | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | |
| 14 | --- a/makedefs |
| 15 | +++ b/makedefs |
| 16 | @@ -613,7 +613,7 @@ EOF |
| 17 | : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} |
| 18 | : ${PLUGIN_LD="${CC-gcc} -shared"} |
| 19 | ;; |
| 20 | - Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR |
| 21 | + Linux.[3-6]*) SYSTYPE=LINUX$RELEASE_MAJOR |
| 22 | case "$CCARGS" in |
| 23 | *-DNO_DB*) ;; |
| 24 | *-DHAS_DB*) ;; |
| 25 | --- a/src/util/sys_defs.h |
| 26 | +++ b/src/util/sys_defs.h |
| 27 | @@ -751,7 +751,7 @@ extern int initgroups(const char *, int) |
| 28 | /* |
| 29 | * LINUX. |
| 30 | */ |
| 31 | -#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) |
| 32 | +#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) || defined(LINUX6) |
| 33 | #define SUPPORTED |
| 34 | #define UINT32_TYPE unsigned int |
| 35 | #define UINT16_TYPE unsigned short |