Skip to content

Commit

Permalink
www/rubygem-passenger: fix failed build
Browse files Browse the repository at this point in the history
Do not bump PORTREVISION cause there where no successful build
since recent update to 6.0.12.
Patch provided by Camden Narzt <support@phusionpassenger.com> in
a private email.
  • Loading branch information
osokin committed Dec 11, 2021
1 parent 685d62d commit 943d12b
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 1 deletion.
2 changes: 2 additions & 0 deletions www/rubygem-passenger/Makefile
Expand Up @@ -4,6 +4,8 @@ PORTNAME= passenger
PORTVERSION= 6.0.12
CATEGORIES= www rubygems
MASTER_SITES= RG
PATCH_SITES= https://github.com/phusion/passenger/commit/
PATCHFILES= 4c8d0a1316000db93eb4484480b2e14188560e14.patch:-p1

MAINTAINER= osa@FreeBSD.org
COMMENT= Modules for running Ruby on Rails and Rack applications
Expand Down
4 changes: 3 additions & 1 deletion www/rubygem-passenger/distinfo
@@ -1,3 +1,5 @@
TIMESTAMP = 1638983871
TIMESTAMP = 1639239547
SHA256 (rubygem/passenger-6.0.12.gem) = d0416639cedc9157044783266f6782a6ff61a84ca31a54b823a215501c6c1c01
SIZE (rubygem/passenger-6.0.12.gem) = 8118784
SHA256 (rubygem/4c8d0a1316000db93eb4484480b2e14188560e14.patch) = 55d5a825a27c64978bea524293c694b53c207976be241aaee679623e43969101
SIZE (rubygem/4c8d0a1316000db93eb4484480b2e14188560e14.patch) = 10527
55 changes: 55 additions & 0 deletions www/rubygem-passenger/files/patch-aligned_alloc.hpp
@@ -0,0 +1,55 @@
--- /dev/null 2021-12-11 11:24:33.892890000 -0500
+++ src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc.hpp 2021-12-10 13:34:33.000000000 -0500
@@ -0,0 +1,52 @@
+/*
+Copyright 2014-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_HPP
+#define BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_HPP
+
+#include <boost/align/detail/is_alignment.hpp>
+#include <boost/align/align.hpp>
+#include <boost/align/alignment_of.hpp>
+#include <boost/assert.hpp>
+#include <cstdlib>
+
+namespace boost {
+namespace alignment {
+
+inline void*
+aligned_alloc(std::size_t alignment, std::size_t size) BOOST_NOEXCEPT
+{
+ BOOST_ASSERT(detail::is_alignment(alignment));
+ enum {
+ N = alignment_of<void*>::value
+ };
+ if (alignment < N) {
+ alignment = N;
+ }
+ std::size_t n = size + alignment - N;
+ void* p = std::malloc(sizeof(void*) + n);
+ if (p) {
+ void* r = static_cast<char*>(p) + sizeof(void*);
+ (void)boost::alignment::align(alignment, size, r, n);
+ *(static_cast<void**>(r) - 1) = p;
+ p = r;
+ }
+ return p;
+}
+
+inline void
+aligned_free(void* ptr) BOOST_NOEXCEPT
+{
+ if (ptr) {
+ std::free(*(static_cast<void**>(ptr) - 1));
+ }
+}
+
+} /* alignment */
+} /* boost */
+
+#endif

0 comments on commit 943d12b

Please sign in to comment.