haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-24 09:08:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

global: fix gcc2 build and purge old version (#5157)

Browse Source
This commit is contained in:
augiedoggie
2020-07-03 23:27:37 -06:00
committed by GitHub
parent 974a37fc63
commit 0ae5e47a3b
4 changed files with 31 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
dev-util/global/patches/global-6.6.3.patchset
View File

@@ -1,14 +1,14 @@
From 9221c7a6778a0d6e91180f925998d8511e740d6d Mon Sep 17 00:00:00 2001
From f31ae852ea345c15c165eae72fc97e2ab6ec6d5e Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Wed, 25 Jun 2014 21:57:57 -0600
Subject: Haiku fixes
diff --git a/configure.ac b/configure.ac
index c4a1aba..b7bbad2 100644
index ce217c2..16e8dd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ LTDL_INIT([recursive])
@@ -60,7 +60,7 @@ LTDL_INIT([recursive])
dnl Checks for libraries.
dnl Checks for header files.
@@ -17,11 +17,32 @@ index c4a1aba..b7bbad2 100644
AC_CHECK_HEADERS(sys/resource.h)
AC_HEADER_DIRENT
if test ${ac_header_dirent} = no; then
diff --git a/gtags-cscope/find.c b/gtags-cscope/find.c
index 650bbe1..3b950fb 100644
--- a/gtags-cscope/find.c
+++ b/gtags-cscope/find.c
@@ -540,6 +540,7 @@ findassign(char *pattern)
char **argv;
FILE *ip, *op;
char *opts[] = {"-d", "-rs", NULL};
+ int i;
STATIC_STRBUF(sb);
strbuf_clear(sb);
@@ -554,7 +555,7 @@ findassign(char *pattern)
op = fopen(temp1, "w");
if (op == NULL)
return FAILED;
- for (int i = 0; opts[i] != NULL; i++) {
+ for (i = 0; opts[i] != NULL; i++) {
secure_open_args();
common();
secure_add_args(opts[i]);
diff --git a/libdb/db.h b/libdb/db.h
index 67ab8f3..c648202 100644
index c13b67e..f4a68f4 100644
--- a/libdb/db.h
+++ b/libdb/db.h
@@ -42,6 +42,9 @@
@@ -40,6 +40,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -32,10 +53,10 @@ index 67ab8f3..c648202 100644
#include "compat.h"
diff --git a/libutil/conf.h b/libutil/conf.h
index 4a3a625..bfd7c73 100644
index 5ac4afc..93ceb0e 100644
--- a/libutil/conf.h
+++ b/libutil/conf.h
@@ -29,7 +29,11 @@
@@ -28,7 +28,11 @@
*/
#define GTAGSCONF "/etc/gtags.conf"
#define DEBIANCONF "/etc/gtags/gtags.conf"
@@ -48,7 +69,7 @@ index 4a3a625..bfd7c73 100644
#define DOS_GTAGSRC "_globalrc"
#endif
diff --git a/libutil/env.c b/libutil/env.c
index d277578..1dfe23e 100644
index 13148e2..4a83aa5 100644
--- a/libutil/env.c
+++ b/libutil/env.c
@@ -32,6 +32,11 @@
@@ -90,5 +111,5 @@ index 14aaec5..a370ec6 100644
dnl We couldn't find ncurses, try SysV curses
dnl
--
1.8.3.4
2.27.0