Attachment 185249 Details for Bug 220681 – Fix multiple stage-qa errors

[patch] Fix multiple stage-qa errors

PR220681.diff (text/plain), 2.53 KB, created by Alan Somers on 2017-08-10 22:10:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Somers

Created: 2017-08-10 22:10:51 UTC

Size: 2.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 447699)
>+++ Makefile	(working copy)
>@@ -28,13 +28,30 @@
> 
> USE_RUBY=	yes
> RAKE_BIN=	${LOCALBASE}/bin/rake
>-USES=		cpe gem
>+USES=		cpe gem libtool shebangfix ssl
>+SHEBANG_FILES=	\
>+	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \
>+	dev/vagrant/nginx_start \
>+	dev/vagrant/provision.sh \
>+	dev/ci/run-tests-with-docker \
>+	dev/ci/scripts/setup-host-natively.sh \
>+	dev/ci/scripts/docker-entrypoint-stage2.sh \
>+	dev/ci/scripts/inituidgid \
>+	dev/ci/scripts/debug-console-wrapper.sh \
>+	dev/ci/scripts/run-tests-natively-stage2.sh \
>+	dev/ci/scripts/docker-entrypoint.sh \
>+	dev/ci/run-tests-natively \
>+	dev/ci/setup-host
>+
> NOPORTDOCS=	yes
> 
> APACHE22_USE=	APACHE=22+
> 
> LIB_DEPENDS+=	libuv.so:devel/libuv \
>-		libcurl.so:ftp/curl
>+		libcurl.so:ftp/curl \
>+		libunwind.so:devel/libunwind \
>+		libapr-1.so:devel/apr1
>+
> BUILD_DEPENDS+=	rubygem-rack16>=0:www/rubygem-rack16
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>@@ -41,6 +58,15 @@
> SUB_LIST+=	GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}
> SUB_FILES=	pkg-message
> 
>+PLIST_DIRS=	${GEM_LIB_DIR}/buildout/common/libboost_oxt/boost \
>+	${GEM_LIB_DIR}/buildout/common/libboost_oxt/oxt \
>+	${GEM_LIB_DIR}/buildout/common/libpassenger_common/DataStructures \
>+	${GEM_LIB_DIR}/buildout/common/libpassenger_common/MemoryKit \
>+	${GEM_LIB_DIR}/buildout/common/libpassenger_common/ServerKit \
>+	${GEM_LIB_DIR}/buildout/common/libpassenger_common/Utils \
>+	${GEM_LIB_DIR}/buildout/common/libpassenger_common/vendor-modified \
>+	${GEM_LIB_DIR}/download_cache
>+
> PLIST_FILES=	bin/passenger \
> 		bin/passenger-config \
> 		bin/passenger-install-apache2-module \
>@@ -62,6 +88,8 @@
> 		s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \
> 		166s!true!false!' \
> 		${WRKSRC}/build/basics.rb
>+	@${REINPLACE_CMD} '1s:python:python2:' \
>+		${WRKSRC}/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py
> 
> pre-patch-DEBUG-off:
> 	@${REINPLACE_CMD} \
>@@ -88,6 +116,9 @@
> 	( cd ${WRKSRC} && \
> 	${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION} )
> 	${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION}/buildout/support-binaries/*
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/ruby/*/passenger_native_support.so
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/support-binaries/PassengerAgent
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so
> 
> post-install-SYMLINK-on:
> 	${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}

Actions: View | Diff

Attachments on bug 220681: 185249