diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-11 11:41:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 11:41:25 -0700 |
| commit | dfd0ca42957f54b0ca8758fe7e1745005fd3cbcc (patch) | |
| tree | 97f24965a57e9bb082805cd2b607d6f8b3ae7d3e /mail | |
| parent | d663e992f6c898d763ad29658393648631017df1 (diff) | |
| parent | 2d155c82ffa002400461e8e4668fe81763b4f834 (diff) | |
Merge pull request #13072 from neheb/alpi
alpine: fix compilation without sys/cdefs
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/alpine/Makefile | 2 | ||||
| -rw-r--r-- | mail/alpine/patches/010-cdefs.patch | 38 |
2 files changed, 39 insertions, 1 deletions
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index 0abf3bb7e..ec9d1e9e7 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alpine PKG_VERSION:=2.23 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://alpine.x10host.com/alpine/release/src diff --git a/mail/alpine/patches/010-cdefs.patch b/mail/alpine/patches/010-cdefs.patch new file mode 100644 index 000000000..f477d2d15 --- /dev/null +++ b/mail/alpine/patches/010-cdefs.patch @@ -0,0 +1,38 @@ +--- a/regex/regex.h ++++ b/regex/regex.h +@@ -42,16 +42,12 @@ + #ifndef _REGEX_H_
+ #define _REGEX_H_
+
+-#ifdef WIN32
+ #include <sys/types.h>
+ #define __const
+ #define __BEGIN_DECLS
+ #define __END_DECLS
+ #define __P(_X) _X
+-#else
+-#include <sys/cdefs.h>
+ #define __stdcall
+-#endif
+
+ /* types */
+ typedef off_t regoff_t;
+@@ -106,12 +102,16 @@ typedef struct { + #define REG_LARGE 01000 /* force large representation */
+ #define REG_BACKR 02000 /* force use of backref code */
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ int __stdcall regcomp __P((regex_t *, const char *, int));
+ size_t __stdcall regerror __P((int, const regex_t *, char *, size_t));
+ int __stdcall regexec __P((const regex_t *,
+ const char *, size_t, regmatch_t [], int));
+ void __stdcall regfree __P((regex_t *));
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* !_REGEX_H_ */
|