- fix build with -fno-common

This commit is contained in:
Dirk Meyer 2020-05-04 11:11:11 +00:00
parent 55fa77b719
commit 748d7f291a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=533914
9 changed files with 432 additions and 1 deletions

View File

@ -0,0 +1,13 @@
--- port.h.orig 2002-10-30 04:48:37 UTC
+++ port.h
@@ -1,8 +1,8 @@
#define PORTLOG 1
#define NOPORTLOG 0
-const char *prompt1;
-const char *prompt2;
+extern const char *prompt1;
+extern const char *prompt2;
int port_open (char *filestr);
void port_init (int fd);
void port_send (int fd, char *str, int len, int log);

View File

@ -110,8 +110,13 @@ IGNORE= option SASL2AUTHD needs option SASL2
TLS_SUFFIX?= -notls
.endif
post-patch:
${REINPLACE_CMD} -e 's| mapspec_kind;|;|' \
${WRKSRC}/include/sm/mapcnf.h
post-configure:
@${CP} ${WRKSRC}/misc/sm.check.sh ${WRKSRC}/misc/sm.setup.sh \
@${CP} ${WRKSRC}/misc/sm.check.sh \
${WRKSRC}/misc/sm.setup.sh \
${WRKDIR}/
@${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \
-e 's|$${SD}/misc|${PREFIX}/bin|' \

128
mail/sma/files/patch-sma.c Normal file
View File

@ -0,0 +1,128 @@
--- sma.c.orig 2003-01-16 11:14:42 UTC
+++ sma.c
@@ -34,6 +34,125 @@ extern int sma_optind;
#include "sma.h"
+/* pointer to program name: */
+char *pname;
+
+/* current time: */
+time_t tval;
+struct tm *curr;
+struct tm tp;
+
+/*
+ * Command line arguments
+ * xflag sets argument x on/off
+ * xchar is pointer to argument string if x requires an argument
+ */
+int aflag;
+int cflag;
+int dflag;
+int hflag;
+int nflag;
+int sflag;
+int qflag;
+int lflag;
+int vflag;
+int wflag;
+unsigned int lnum;
+unsigned int lrnum;
+int rflag;
+unsigned int rnum;
+unsigned int rrnum;
+int bflag;
+const char *bchar;
+int fflag;
+const char *fchar;
+int oflag;
+const char *ochar;
+int Lflag;
+const char *Lchar;
+int Oflag;
+const char *Ochar;
+int Dflag;
+const char *Dchar;
+int pflag;
+int iflag;
+int tflag;
+int dcaddrflag;
+const char *tchar;
+
+/* Configuration file parameters: */
+int Hflag;
+const char *Hchar;
+int Cflag;
+const char *Cchar;
+int Fflag;
+const char *tbchar;
+int pgflag;
+const char *bechar;
+const char *cfchar;
+const char *puchar;
+const char *pachar;
+const char *plchar;
+const char *ppchar;
+const char *htchar;
+const char *ftchar;
+int csflag;
+int lrflag;
+int rrflag;
+int clsflag;
+unsigned int stnum;
+unsigned int rsnum;
+unsigned int rsrnum;
+unsigned int epnum;
+unsigned int rpnum;
+
+/* Start and end times: */
+char *sstring;
+char *estring;
+char *tstring;
+time_t sstime;
+time_t eetime;
+int syear;
+int smonth;
+int sday;
+int shour;
+int sminute;
+int ssecond;
+int eyear;
+int emonth;
+int eday;
+int ehour;
+int eminute;
+int esecond;
+
+/* hash table sizes: */
+int asize;
+int rsize;
+char *hsstring;
+char *hastring;
+char *hrstring;
+
+/* Filters */
+char *sef;
+char *ref;
+char *srf;
+char *rrf;
+#ifdef USE_REGEXP
+regex_t csef;
+regex_t cref;
+regex_t csrf;
+regex_t crrf;
+#endif
+
+/* Output file handle: */
+FILE *ofp;
+
+/* total number of hosts: */
+int hosts;
+
+/* inital host structure: */
+struct host first;
+
int
main(int argc, char **argv) {
FILE *fp = NULL;

224
mail/sma/files/patch-sma.h Normal file
View File

@ -0,0 +1,224 @@
--- sma.h.orig 2003-04-03 09:43:53 UTC
+++ sma.h
@@ -55,102 +55,102 @@
#define FORMAT_CLOG 5
/* pointer to program name: */
-char *pname;
+extern char *pname;
/* current time: */
-time_t tval;
-struct tm *curr;
-struct tm tp;
+extern time_t tval;
+extern struct tm *curr;
+extern struct tm tp;
/*
* Command line arguments
* xflag sets argument x on/off
* xchar is pointer to argument string if x requires an argument
*/
-int aflag;
-int cflag;
-int dflag;
-int hflag;
-int nflag;
-int sflag;
-int qflag;
-int lflag;
-int vflag;
-int wflag;
-unsigned int lnum;
-unsigned int lrnum;
-int rflag;
-unsigned int rnum;
-unsigned int rrnum;
-int bflag;
-const char *bchar;
-int fflag;
-const char *fchar;
-int oflag;
-const char *ochar;
-int Lflag;
-const char *Lchar;
-int Oflag;
-const char *Ochar;
-int Dflag;
-const char *Dchar;
-int pflag;
-int iflag;
-int tflag;
-int dcaddrflag;
-const char *tchar;
+extern int aflag;
+extern int cflag;
+extern int dflag;
+extern int hflag;
+extern int nflag;
+extern int sflag;
+extern int qflag;
+extern int lflag;
+extern int vflag;
+extern int wflag;
+extern unsigned int lnum;
+extern unsigned int lrnum;
+extern int rflag;
+extern unsigned int rnum;
+extern unsigned int rrnum;
+extern int bflag;
+extern const char *bchar;
+extern int fflag;
+extern const char *fchar;
+extern int oflag;
+extern const char *ochar;
+extern int Lflag;
+extern const char *Lchar;
+extern int Oflag;
+extern const char *Ochar;
+extern int Dflag;
+extern const char *Dchar;
+extern int pflag;
+extern int iflag;
+extern int tflag;
+extern int dcaddrflag;
+extern const char *tchar;
/* Configuration file parameters: */
-int Hflag;
-const char *Hchar;
-int Cflag;
-const char *Cchar;
-int Fflag;
-const char *tbchar;
-int pgflag;
-const char *bechar;
-const char *cfchar;
-const char *puchar;
-const char *pachar;
-const char *plchar;
-const char *ppchar;
-const char *htchar;
-const char *ftchar;
-int csflag;
-int lrflag;
-int rrflag;
-int clsflag;
-unsigned int stnum;
-unsigned int rsnum;
-unsigned int rsrnum;
-unsigned int epnum;
-unsigned int rpnum;
+extern int Hflag;
+extern const char *Hchar;
+extern int Cflag;
+extern const char *Cchar;
+extern int Fflag;
+extern const char *tbchar;
+extern int pgflag;
+extern const char *bechar;
+extern const char *cfchar;
+extern const char *puchar;
+extern const char *pachar;
+extern const char *plchar;
+extern const char *ppchar;
+extern const char *htchar;
+extern const char *ftchar;
+extern int csflag;
+extern int lrflag;
+extern int rrflag;
+extern int clsflag;
+extern unsigned int stnum;
+extern unsigned int rsnum;
+extern unsigned int rsrnum;
+extern unsigned int epnum;
+extern unsigned int rpnum;
/* Start and end times: */
-char *sstring;
-char *estring;
-char *tstring;
-time_t sstime;
-time_t eetime;
-int syear;
-int smonth;
-int sday;
-int shour;
-int sminute;
-int ssecond;
-int eyear;
-int emonth;
-int eday;
-int ehour;
-int eminute;
-int esecond;
+extern char *sstring;
+extern char *estring;
+extern char *tstring;
+extern time_t sstime;
+extern time_t eetime;
+extern int syear;
+extern int smonth;
+extern int sday;
+extern int shour;
+extern int sminute;
+extern int ssecond;
+extern int eyear;
+extern int emonth;
+extern int eday;
+extern int ehour;
+extern int eminute;
+extern int esecond;
/* hash table sizes: */
-int asize;
-int rsize;
-char *hsstring;
-char *hastring;
-char *hrstring;
+extern int asize;
+extern int rsize;
+extern char *hsstring;
+extern char *hastring;
+extern char *hrstring;
/* sender structure: */
struct in {
@@ -456,25 +456,25 @@ struct host {
};
/* Filters */
-char *sef;
-char *ref;
-char *srf;
-char *rrf;
+extern char *sef;
+extern char *ref;
+extern char *srf;
+extern char *rrf;
#ifdef USE_REGEXP
-regex_t csef;
-regex_t cref;
-regex_t csrf;
-regex_t crrf;
+extern regex_t csef;
+extern regex_t cref;
+extern regex_t csrf;
+extern regex_t crrf;
#endif
/* Output file handle: */
-FILE *ofp;
+extern FILE *ofp;
/* total number of hosts: */
-int hosts;
+extern int hosts;
/* inital host structure: */
-struct host first;
+extern struct host first;
/* function definitions: */
void usage(void);

View File

@ -0,0 +1,15 @@
--- src/util.h.orig 2019-01-05 13:22:11 UTC
+++ src/util.h
@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
extern MUTEX(x11Mutex);
extern MUTEX(scrollMutex);
-MUTEX(clientMutex);
-MUTEX(inputMutex);
-MUTEX(pointerMutex);
+extern MUTEX(clientMutex);
+extern MUTEX(inputMutex);
+extern MUTEX(pointerMutex);
#endif
#define X_INIT INIT_MUTEX(x11Mutex)

View File

@ -0,0 +1,13 @@
--- src/x11vnc.c.orig 2019-01-05 13:22:11 UTC
+++ src/x11vnc.c
@@ -186,6 +186,10 @@ static void tsdo_timeout (int sig) {
static pid_t ts_tasks[TASKMAX];
static int ts_taskn = -1;
+MUTEX(clientMutex);
+MUTEX(inputMutex);
+MUTEX(pointerMutex);
+
int tsdo(int port, int lsock, int *conn) {
int csock, rsock, i, db = 1;
pid_t pid;

View File

@ -0,0 +1,11 @@
--- libcnews/mkinperm.c.orig 2020-05-02 08:20:33 UTC
+++ libcnews/mkinperm.c
@@ -24,7 +24,7 @@
#endif
int mkinpdebug = 0;
-const char *progname;
+extern const char *progname;
int /* true iff succeeded */
mkinperm(tmpname, grade, class)

View File

@ -0,0 +1,11 @@
--- tools/xenstore/utils.h.orig 2019-12-17 14:23:09 UTC
+++ tools/xenstore/utils.h
@@ -24,7 +24,7 @@ static inline bool strends(const char *a, const char *
void barf(const char *fmt, ...) __attribute__((noreturn));
void barf_perror(const char *fmt, ...) __attribute__((noreturn));
-void (*xprintf)(const char *fmt, ...);
+extern void (*xprintf)(const char *fmt, ...);
#define eprintf(_fmt, _args...) xprintf("[ERR] %s" _fmt, __FUNCTION__, ##_args)

View File

@ -0,0 +1,11 @@
--- tools/xenstore/xenstored_core.h.orig 2019-12-17 14:23:09 UTC
+++ tools/xenstore/xenstored_core.h
@@ -204,7 +204,7 @@ void finish_daemonize(void);
/* Open a pipe for signal handling */
void init_pipe(int reopen_log_pipe[2]);
-xengnttab_handle **xgt_handle;
+extern xengnttab_handle **xgt_handle;
int remember_string(struct hashtable *hash, const char *str);