mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-09 15:27:06 +02:00
bd91ab871c
* gpm.h is in src/headers/; some but not all rules allowed for this. * FD_ZERO, FD_SET, and fd_set are defined in <sys/select.h> * gpm-root had a number of bad assumptions about non-glibc systems.
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
commit 462cd6c81a2321872a5807e652780eb90a0fb40e
|
|
Author: Isaac Dunham <ibid.ag@gmail.com>
|
|
Date: Tue Jul 15 14:39:37 2014 -0700
|
|
|
|
Add -Iheaders so we can find gpm.h
|
|
|
|
diff --git a/src/Makefile.in b/src/Makefile.in
|
|
index d3b1dcd..1f8a4dc 100644
|
|
--- a/src/Makefile.in
|
|
+++ b/src/Makefile.in
|
|
@@ -65,7 +65,7 @@ prog/%: prog/%.o
|
|
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $^ @LIBS@ $(LIBS)
|
|
|
|
%.o: %.c
|
|
- $(CC) @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o $@ $<
|
|
+ $(CC) -Iheaders @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o $@ $<
|
|
|
|
%.lo: %.c
|
|
$(CC) @CPPFLAGS@ $(CPPFLAGS) @PICFLAGS@ @CFLAGS@ $(CFLAGS) -c -o $@ $<
|
|
@@ -96,7 +96,7 @@ $(DEPFILE) dep: prog/gpm-root.c
|
|
|
|
# create dependencies
|
|
for DEPS in `echo *.c */*.c`; do \
|
|
- $(CC) -I. -I $(srcdir) -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \
|
|
+ $(CC) -I. -Iheaders -I $(srcdir) -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \
|
|
$(SED) 's/^\(.*\)\.o\([ :]+\)/\1.o \1.lo\2/g' >> $(DEPFILE) ; done
|
|
|
|
### INSTALL
|
|
diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
|
|
index 98297c9..f7df875 100644
|
|
--- a/src/daemon/open_console.c
|
|
+++ b/src/daemon/open_console.c
|
|
@@ -22,6 +22,7 @@
|
|
#include <fcntl.h> /* open and co. */
|
|
#include <sys/stat.h> /* stat() */
|
|
#include <sys/ioctl.h> /* ioctl */
|
|
+#include <sys/sysmacros.h> /* major() */
|
|
|
|
/* Linux specific (to be outsourced in gpm2 */
|
|
#include <linux/serial.h> /* for serial console check */
|