Skip to content

Commit b755f57

Browse files
committed
various: Add MULTIARCH support.
1 parent 78dcda1 commit b755f57

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

libee/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ MAKE_JOBS_SAFE= no
1717

1818
USE_LIBTOOL= yes
1919
USE_TOOLS+= bash pkg-config
20+
USE_MULTIARCH= lib
2021

2122
PKGCONFIG_OVERRIDE+= libee.pc.in
2223

libeio/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ LICENSE= 2-clause-bsd OR gnu-gpl-v2
1414
GNU_CONFIGURE= yes
1515
USE_LIBTOOL= yes
1616
USE_TOOLS+= autoconf automake
17+
USE_MULTIARCH= lib
1718

1819
WRKSRC= ${WRKDIR}/${PKGBASE}-${DISTNAME}
1920

p5-Imager/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ HOMEPAGE= https://metacpan.org/release/Imager
1010
COMMENT= Perl module for manipulating gray, color, and RGBA format images
1111
LICENSE= ${PERL5_LICENSE}
1212

13+
USE_MULTIARCH= lib
14+
1315
PERL5_PACKLIST= auto/Imager/.packlist
1416

1517
.include "../../fonts/t1lib/buildlink3.mk"

v8-316/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
1515
USE_LANGUAGES= c c++
1616
USE_TOOLS+= gmake:run
1717

18+
USE_MULTIARCH= yes
19+
1820
NO_CONFIGURE= yes
1921
BUILD_TARGET= native
2022
TEST_TARGET= native.check
@@ -42,7 +44,7 @@ REPLACE_PYTHON= tools/*.py tools/*/*.py tools/*/*/*.py
4244
REPLACE_PYTHON+= third_party/icu/source/*/*.py
4345
REPLACE_PYTHON+= third_party/icu/source/*/*/*.py
4446

45-
INSTALLATION_DIRS+= bin include lib
47+
INSTALLATION_DIRS+= bin include lib${LIBARCHSUFFIX}
4648

4749
INSTALL_INCLUDES= v8-debug.h v8-preparser.h v8-profiler.h
4850
INSTALL_INCLUDES+= v8-testing.h v8.h
@@ -54,8 +56,8 @@ do-install:
5456
${INSTALL_LIB} ${WRKSRC}/out/native/libv8.dylib ${DESTDIR}${PREFIX}/lib/libv8.1.dylib
5557
${LN} -sf libv8.1.dylib ${DESTDIR}${PREFIX}/lib/libv8.dylib
5658
.else
57-
${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib/libv8.so.1
58-
${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib/libv8.so
59+
${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so.1
60+
${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so
5961
.endif
6062
.for inc in ${INSTALL_INCLUDES}
6163
${INSTALL_DATA} ${WRKSRC}/include/${inc} ${DESTDIR}${PREFIX}/include

v8/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
1515
USE_LANGUAGES= c c++
1616
USE_TOOLS+= gmake:run
1717

18+
USE_MULTIARCH= yes
19+
1820
NO_CONFIGURE= yes
1921
#BUILD_TARGET= native
2022
#TEST_TARGET= native.check
@@ -58,7 +60,7 @@ REPLACE_PYTHON= tools/*.py tools/*/*.py tools/*/*/*.py
5860
REPLACE_PYTHON+= third_party/icu/source/*/*.py
5961
REPLACE_PYTHON+= third_party/icu/source/*/*/*.py
6062

61-
INSTALLATION_DIRS+= bin include lib
63+
INSTALLATION_DIRS+= bin include lib${LIBARCHSUFFIX}
6264

6365
INSTALL_INCLUDES= v8-debug.h v8-platform.h v8-profiler.h
6466
INSTALL_INCLUDES+= v8-testing.h v8-util.h v8.h
@@ -80,8 +82,8 @@ do-install:
8082
${INSTALL_LIB} ${WRKSRC}/out/native/libv8.dylib ${DESTDIR}${PREFIX}/lib/libv8.1.dylib
8183
${LN} -sf libv8.1.dylib ${DESTDIR}${PREFIX}/lib/libv8.dylib
8284
.else
83-
${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib/libv8.so.1
84-
${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib/libv8.so
85+
${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so.1
86+
${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so
8587
.endif
8688
.for inc in ${INSTALL_INCLUDES}
8789
${INSTALL_DATA} ${WRKSRC}/include/${inc} ${DESTDIR}${PREFIX}/include

0 commit comments

Comments
 (0)