Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
passenger
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
passenger
Commits
01f6042e
Commit
01f6042e
authored
Sep 24, 2021
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed 'flexible array member not at end of' error on ARM devices
parent
446cee42
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
Makefile
Makefile
+1
-0
passenger-6.0.5-cmsghdr_fix.patch
passenger-6.0.5-cmsghdr_fix.patch
+23
-0
No files found.
Makefile
View file @
01f6042e
...
...
@@ -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
...
...
passenger-6.0.5-cmsghdr_fix.patch
0 → 100644
View file @
01f6042e
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))];
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment