diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-01-27 02:04:07 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-01-27 02:04:07 +0000 |
| commit | 843765cd95a8fcfb7db1b5d59399de96e0ee7893 (patch) | |
| tree | 588c466c6047107f10827b62927df31e02b027b8 | |
| parent | ddbb174a97f0233bd4b032bc51235aa2539e86a7 (diff) | |
| download | screen-843765cd95a8fcfb7db1b5d59399de96e0ee7893.tar.gz | |
Really fix SVR4 issues
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/solaris-disable-SVR4-check.patch | 19 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/debian/patches/series b/debian/patches/series index 3ed864e..28ae7dc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -30,3 +30,4 @@ # 80-99: experimental patches, new features etc. 80EXP_session_creation_time.patch solaris-dev-console.patch +solaris-disable-SVR4-check.patch diff --git a/debian/patches/solaris-disable-SVR4-check.patch b/debian/patches/solaris-disable-SVR4-check.patch new file mode 100644 index 0000000..d7b1890 --- /dev/null +++ b/debian/patches/solaris-disable-SVR4-check.patch @@ -0,0 +1,19 @@ +Index: screen/configure.in +=================================================================== +--- screen.orig/configure.in 2013-01-26 09:35:37.121238837 +0000 ++++ screen/configure.in 2013-01-27 00:56:51.743861929 +0000 +@@ -201,14 +201,6 @@ + #endif + ], LIBS="$LIBS -lsocket -linet";seqptx=1) + +-oldlibs="$LIBS" +-LIBS="$LIBS -lelf" +-AC_CHECKING(SVR4) +-AC_TRY_LINK([#include <utmpx.h> +-],, +-[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN), +-[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])] +-,LIBS="$oldlibs") + AC_CHECK_HEADERS([stropts.h string.h strings.h]) + + AC_CHECKING(for Solaris 2.x) diff --git a/debian/rules b/debian/rules index 1257796..20e0489 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ CC_OPTFLAGS := -O2 -g endif ifeq (illumos,$(DEB_HOST_ARCH_OS)) -CFLAGS += -DSVR4 +CPPFLAGS += -DSVR4 endif clean: |