diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-07 11:31:43 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-07 11:32:39 +0100 |
| commit | 15994eb0d3356a4418f81819a368fc2eea99fd26 (patch) | |
| tree | 683fab971bd657020e4d001ab85e0ace2f14291f /patches/mgetty-1.1.36 | |
| parent | 00a75f56edaa30442b604a0ed44bc2522bab3dd9 (diff) | |
| download | ptxdist-15994eb0d3356a4418f81819a368fc2eea99fd26.tar.gz ptxdist-15994eb0d3356a4418f81819a368fc2eea99fd26.tar.xz | |
mgetty: fix building with gcc 7.x
Without this, building with gcc 7.x fails with:
pbm2g3.o: In function `main':
pbm2g3.c:(.text.startup+0x180): undefined reference to `puteol'
pbm2g3.c:(.text.startup+0x18c): undefined reference to `putwhitespan'
pbm2g3.c:(.text.startup+0x190): undefined reference to `puteol'
pbm2g3.c:(.text.startup+0x1ac): undefined reference to `puteol'
pbm2g3.c:(.text.startup+0x1b0): undefined reference to `puteol'
pbm2g3.c:(.text.startup+0x1b4): undefined reference to `puteol'
pbm2g3.c:(.text.startup+0x1b8): undefined reference to `puteol'
pbm2g3.o:pbm2g3.c:(.text.startup+0x1bc): more undefined references to `puteol' follow
collect2: error: ld returned 1 exit status
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/mgetty-1.1.36')
| -rw-r--r-- | patches/mgetty-1.1.36/0003-fix-building-with-gcc-7.x.patch | 78 | ||||
| -rw-r--r-- | patches/mgetty-1.1.36/series | 3 |
2 files changed, 80 insertions, 1 deletions
diff --git a/patches/mgetty-1.1.36/0003-fix-building-with-gcc-7.x.patch b/patches/mgetty-1.1.36/0003-fix-building-with-gcc-7.x.patch new file mode 100644 index 000000000..7783883b6 --- /dev/null +++ b/patches/mgetty-1.1.36/0003-fix-building-with-gcc-7.x.patch @@ -0,0 +1,78 @@ +From: Hilko Bengen <bengen@debian.org> +Date: Wed, 7 Feb 2018 10:59:18 +0100 +Subject: [PATCH] fix building with gcc 7.x + +make some functions static + +Patch imported from Debian. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + g3/g3cat.c | 3 +++ + g3/pbm2g3.c | 4 ++++ + 2 files changed, 7 insertions(+) + +diff --git a/g3/g3cat.c b/g3/g3cat.c +index 8a4b708afa7e..4205d332cde7 100644 +--- a/g3/g3cat.c ++++ b/g3/g3cat.c +@@ -67,6 +67,7 @@ void putcode _P2( (code, len), int code, int len ) + } + + #ifdef __GNUC__ ++static + inline + #endif + void putwhitespan _P1( (l), int l ) +@@ -98,6 +99,7 @@ void putwhitespan _P1( (l), int l ) + } + + #ifdef __GNUC__ ++static + inline + #endif + void putblackspan _P1( (l), int l ) +@@ -129,6 +131,7 @@ void putblackspan _P1( (l), int l ) + } + + #ifdef __GNUC__ ++static + inline + #endif + void puteol _P0( void ) /* write byte-aligned EOL */ +diff --git a/g3/pbm2g3.c b/g3/pbm2g3.c +index 283a72867312..7dc81a808bfc 100644 +--- a/g3/pbm2g3.c ++++ b/g3/pbm2g3.c +@@ -40,6 +40,7 @@ static unsigned int out_hibit = 0; + static int out_byte_tab[ 256 ]; /* for g3 byte reversal */ + + #ifdef __GNUC__ ++static + inline + #endif + void putcode _P2( (code, len), int code, int len ) +@@ -60,6 +61,7 @@ void putcode _P2( (code, len), int code, int len ) + } + + #ifdef __GNUC__ ++static + inline + #endif + void puteol _P0( void ) /* write byte-aligned EOL */ +@@ -69,6 +71,7 @@ void puteol _P0( void ) /* write byte-aligned EOL */ + } + + #ifdef __GNUC__ ++static + inline + #endif + void putwhitespan _P1( (l), int l ) +@@ -100,6 +103,7 @@ void putwhitespan _P1( (l), int l ) + } + + #ifdef __GNUC__ ++static + inline + #endif + void putblackspan _P1( (l), int l ) diff --git a/patches/mgetty-1.1.36/series b/patches/mgetty-1.1.36/series index a5754157a..a518c09ac 100644 --- a/patches/mgetty-1.1.36/series +++ b/patches/mgetty-1.1.36/series @@ -2,4 +2,5 @@ #tag:base --start-number 1 0001-fix-install.patch 0002-fix-building-on-arm64.patch -# fc05b6ed9561e1654fa95e4434ac515a - git-ptx-patches magic +0003-fix-building-with-gcc-7.x.patch +# 96cac79d77bdaba764aa0a1ae734b06b - git-ptx-patches magic |