mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 00:30:06 +02:00
142 lines
5.0 KiB
Plaintext
142 lines
5.0 KiB
Plaintext
From 37e997f3fcf44261e3af16289f7412f63c7060d8 Mon Sep 17 00:00:00 2001
|
|
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
|
Date: Mon, 8 Jul 2013 15:51:09 +0200
|
|
Subject: progs/Makefile.in: make sure the right programs are installed
|
|
|
|
The Makefile installed the libtool wrapper scripts which are only meant
|
|
to be used for the build.
|
|
|
|
diff --git a/progs/Makefile.in b/progs/Makefile.in
|
|
index bdb8a0f..f3170f1 100644
|
|
--- a/progs/Makefile.in
|
|
+++ b/progs/Makefile.in
|
|
@@ -188,19 +188,19 @@ transform.h :
|
|
echo "#endif /* __TRANSFORM_H */" >>$@
|
|
|
|
install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
|
|
-@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x $(DESTDIR)$(bindir)/$(actual_tic)
|
|
-@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x $(DESTDIR)$(bindir)/$(actual_toe)
|
|
+@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tic$x $(DESTDIR)$(bindir)/$(actual_tic)
|
|
+@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/toe$x $(DESTDIR)$(bindir)/$(actual_toe)
|
|
@MAKE_TERMINFO@ @echo "linking $(actual_infotocap) to $(actual_tic)"
|
|
@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
|
|
@MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap))
|
|
@MAKE_TERMINFO@ @echo "linking $(actual_captoinfo) to $(actual_tic)"
|
|
@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
|
|
@MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
|
|
- $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
|
|
- $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(DESTDIR)$(bindir)/$(actual_clear)
|
|
- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(DESTDIR)$(bindir)/$(actual_tabs)
|
|
- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x $(DESTDIR)$(bindir)/$(actual_tput)
|
|
- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(DESTDIR)$(bindir)/$(actual_tset)
|
|
+ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
|
|
+ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/clear$x $(DESTDIR)$(bindir)/$(actual_clear)
|
|
+ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tabs$x $(DESTDIR)$(bindir)/$(actual_tabs)
|
|
+ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tput$x $(DESTDIR)$(bindir)/$(actual_tput)
|
|
+ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tset$x $(DESTDIR)$(bindir)/$(actual_tset)
|
|
@echo "linking $(actual_reset) to $(actual_tset)"
|
|
-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
|
|
(cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset))
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From da0fc621f822b1a96893382c96671a6107d4c8fc Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sat, 11 Aug 2018 15:25:13 +0200
|
|
Subject: applying patch ncurses-5.9-gcc-5.patch
|
|
|
|
|
|
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
|
|
index 66ae295..b92f22b 100755
|
|
--- a/ncurses/base/MKlib_gen.sh
|
|
+++ b/ncurses/base/MKlib_gen.sh
|
|
@@ -437,11 +437,22 @@ sed -n -f $ED1 \
|
|
-e 's/gen_$//' \
|
|
-e 's/ / /g' >>$TMP
|
|
|
|
+cat >$ED1 <<EOF
|
|
+s/ / /g
|
|
+s/^ //
|
|
+s/ $//
|
|
+s/P_NCURSES_BOOL/NCURSES_BOOL/g
|
|
+EOF
|
|
+
|
|
+# A patch discussed here:
|
|
+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
|
|
+# introduces spurious #line markers. Work around that by ignoring the system's
|
|
+# attempt to define "bool" and using our own symbol here.
|
|
+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
|
|
+cat $ED2 >$TMP
|
|
+
|
|
$preprocessor $TMP 2>/dev/null \
|
|
-| sed \
|
|
- -e 's/ / /g' \
|
|
- -e 's/^ //' \
|
|
- -e 's/_Bool/NCURSES_BOOL/g' \
|
|
+| sed -f $ED1 \
|
|
| $AWK -f $AW2 \
|
|
| sed -f $ED3 \
|
|
| sed \
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From f3bd12f6cbc6838c00758b2a0d2d57223cc2d429 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sat, 11 Aug 2018 16:23:27 +0200
|
|
Subject: gcc7 build fix.
|
|
|
|
|
|
diff --git a/c++/cursesf.h b/c++/cursesf.h
|
|
index 70a30c3..21eae51 100644
|
|
--- a/c++/cursesf.h
|
|
+++ b/c++/cursesf.h
|
|
@@ -381,7 +381,7 @@ protected:
|
|
uptr->m_user = user;
|
|
}
|
|
|
|
- inline void *get_user() {
|
|
+ inline void *get_user() const {
|
|
UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
|
|
assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
|
|
return uptr->m_user;
|
|
diff --git a/c++/cursesm.h b/c++/cursesm.h
|
|
index d9c2273..f2d9466 100644
|
|
--- a/c++/cursesm.h
|
|
+++ b/c++/cursesm.h
|
|
@@ -242,7 +242,7 @@ protected:
|
|
uptr->m_user = user;
|
|
}
|
|
|
|
- inline void *get_user() {
|
|
+ inline void *get_user() const {
|
|
UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
|
|
assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
|
|
return uptr->m_user;
|
|
diff --git a/c++/cursesp.h b/c++/cursesp.h
|
|
index 9b63d6d..ca8f283 100644
|
|
--- a/c++/cursesp.h
|
|
+++ b/c++/cursesp.h
|
|
@@ -58,7 +58,7 @@ private:
|
|
const PANEL* m_owner; // the panel itself
|
|
} UserHook;
|
|
|
|
- inline UserHook *UserPointer()
|
|
+ inline UserHook *UserPointer() const
|
|
{
|
|
UserHook* uptr = reinterpret_cast<UserHook*>(
|
|
const_cast<void *>(::panel_userptr (p)));
|
|
@@ -77,7 +77,7 @@ protected:
|
|
}
|
|
// Set the user pointer of the panel.
|
|
|
|
- void *get_user()
|
|
+ void *get_user() const
|
|
{
|
|
UserHook* uptr = UserPointer();
|
|
void *result = 0;
|
|
--
|
|
2.16.4
|
|
|