Commit 01f6042e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed 'flexible array member not at end of' error on ARM devices

parent 446cee42
......@@ -6,6 +6,7 @@ all: httpd-conf
tar xf passenger-6.0.5.tar.gz
patch -Np1 -d passenger-6.0.5 < passenger-6.0.5-apache_modules.patch
patch -Np1 -d passenger-6.0.5 < passenger-6.0.5-cmsghdr_fix.patch
cd passenger-6.0.5 && rake fakeroot
cp -rdfp passenger-6.0.5/pkg/fakeroot/usr /
/usr/bin/passenger-install-apache2-module
......
diff -uNr passenger-6.0.5/src/cxx_supportlib/IOTools/IOUtils.cpp passenger-6.0.5-cmsghdr_fix/src/cxx_supportlib/IOTools/IOUtils.cpp
--- passenger-6.0.5/src/cxx_supportlib/IOTools/IOUtils.cpp 2013-10-27 10:30:00.000000000 +1030
+++ passenger-6.0.5-cmsghdr_fix/src/cxx_supportlib/IOTools/IOUtils.cpp 2021-09-24 13:04:38.780117193 +0930
@@ -1187,8 +1187,8 @@
// File descriptor passing macros (CMSG_*) seem to be broken
// on 64-bit MacOS X. This structure works around the problem.
struct {
- struct cmsghdr header;
int fd;
+ struct cmsghdr header;
} control_data;
#define EXPECTED_CMSG_LEN sizeof(control_data)
#else
@@ -1244,8 +1244,8 @@
char dummy[1];
#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
struct {
- struct cmsghdr header;
int fd;
+ struct cmsghdr header;
} control_data;
#else
char control_data[CMSG_SPACE(sizeof(int))];
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment