1
0
Переглянути джерело

package/screen: fix build

The problem is, sched.h is found in the local directory and therefore
falsely included from system headers. This probably has something to do
with openadk relying on builtin header inclusion in gcc instead of
specifying them explicitly.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Phil Sutter 9 роки тому
батько
коміт
eccb31b237
2 змінених файлів з 12 додано та 0 видалено
  1. 1 0
      package/screen/Makefile
  2. 11 0
      package/screen/patches/patch-screen_h

+ 1 - 0
package/screen/Makefile

@@ -31,6 +31,7 @@ pre-build:
 	echo '#undef GETUTENT' >> ${WRKBUILD}/config.h
 	echo '#undef UTHOST' >> ${WRKBUILD}/config.h
 	echo '#undef BUGGYGETLOGIN' >> ${WRKBUILD}/config.h
+	mv ${WRKBUILD}/sched.h ${WRKBUILD}/my_sched.h
 
 screen-install:
 	${INSTALL_DIR} ${IDIR_SCREEN}/usr/bin

+ 11 - 0
package/screen/patches/patch-screen_h

@@ -0,0 +1,11 @@
+--- screen-4.2.1.orig/screen.h	2014-04-28 00:08:06.000000000 +0200
++++ screen-4.2.1/screen.h	2015-02-19 02:36:51.299000393 +0100
+@@ -43,7 +43,7 @@
+ #include "osdef.h"
+ 
+ #include "ansi.h"
+-#include "sched.h"
++#include "my_sched.h"
+ #include "acls.h"
+ #include "comm.h"
+ #include "layer.h"