From 1edc8846ca621ecc5f87873c28e9ee43ba1921a4 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Wed, 3 Oct 2018 04:16:47 -0400 Subject: [PATCH] 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. --- common/environment/build-style/perl-ModuleBuild.sh | 1 + common/environment/build-style/ruby-module.sh | 1 + common/hooks/pre-pkg/05-prepare-32bit.sh | 8 -------- 3 files changed, 2 insertions(+), 8 deletions(-) create mode 100644 common/environment/build-style/perl-ModuleBuild.sh create mode 100644 common/environment/build-style/ruby-module.sh diff --git a/common/environment/build-style/perl-ModuleBuild.sh b/common/environment/build-style/perl-ModuleBuild.sh new file mode 100644 index 0000000000..2444d3d104 --- /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 0000000000..2444d3d104 --- /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 881d87aea6..1b6a5ae216 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