aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToyam Cox <Vaelatern@voidlinux.eu>2018-10-03 08:16:47 +0000
committerEnno Boland <g@s01.de>2018-10-04 08:28:27 +0000
commit1edc8846ca621ecc5f87873c28e9ee43ba1921a4 (patch)
tree9f85df0e305157b3ab6b393434f98d8aea0dee24
parent1ec953f6376db01e96893855000704c085e373fe (diff)
downloadvoid-packages-1edc8846ca621ecc5f87873c28e9ee43ba1921a4.tar
void-packages-1edc8846ca621ecc5f87873c28e9ee43ba1921a4.tar.gz
void-packages-1edc8846ca621ecc5f87873c28e9ee43ba1921a4.tar.bz2
void-packages-1edc8846ca621ecc5f87873c28e9ee43ba1921a4.tar.lz
void-packages-1edc8846ca621ecc5f87873c28e9ee43ba1921a4.tar.xz
void-packages-1edc8846ca621ecc5f87873c28e9ee43ba1921a4.tar.zst
void-packages-1edc8846ca621ecc5f87873c28e9ee43ba1921a4.zip
xbps-src: Migrate from build_style for 32bit pkgs
This allows dxpb to have a simpler test for whether or not a 32bit package will be built.
-rw-r--r--common/environment/build-style/perl-ModuleBuild.sh1
-rw-r--r--common/environment/build-style/ruby-module.sh1
-rw-r--r--common/hooks/pre-pkg/05-prepare-32bit.sh8
3 files changed, 2 insertions, 8 deletions
diff --git a/common/environment/build-style/perl-ModuleBuild.sh b/common/environment/build-style/perl-ModuleBuild.sh
new file mode 100644
index 00000000000..2444d3d104f
--- /dev/null
+++ b/common/environment/build-style/perl-ModuleBuild.sh
@@ -0,0 +1 @@
+lib32disabled=yes
diff --git a/common/environment/build-style/ruby-module.sh b/common/environment/build-style/ruby-module.sh
new file mode 100644
index 00000000000..2444d3d104f
--- /dev/null
+++ b/common/environment/build-style/ruby-module.sh
@@ -0,0 +1 @@
+lib32disabled=yes
diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh
index 881d87aea60..1b6a5ae2161 100644
--- a/common/hooks/pre-pkg/05-prepare-32bit.sh
+++ b/common/hooks/pre-pkg/05-prepare-32bit.sh
@@ -12,14 +12,6 @@
hook() {
local destdir32=${XBPS_DESTDIR}/${pkgname}-32bit-${version}
- # Do not build 32bit pkgs for:
- # - perl modules
- # - python modules
- # - ruby modules
- if [[ $build_style =~ (perl|python|ruby) ]]; then
- return
- fi
-
# By default always enabled unless "lib32disabled" is set.
if [ -n "$lib32disabled" ]; then
return