i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove GPL-add-ons build machinery.

Browse Source 
No longer used by anything (it appears some old kernel drivers that
are not included in the build might use it, but I don't know why
they need it -- we already ship GPL'd code [libntfs] for the kernel
in the default build unconditionally.)

Briefly discussed with js a few weeks back.
This commit is contained in:
Augustin Cavalier
2017-07-30 14:13:42 -04:00
parent dd4eae252e
commit ff0184bed0
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
-5
View File
@@ -677,10 +677,5 @@ if $(TARGET_PACKAGING_ARCH) = x86_64 {
} }
} }
# GPL add-ons
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
EnableBuildFeatures gpl ;
}
# ATA Drivers + Bus # ATA Drivers + Bus
EnableBuildFeatures ata ; EnableBuildFeatures ata ;
build/jam/MiscRules
-9
View File
@@ -63,15 +63,6 @@ rule SetupFeatureObjectsDir feature
; ;
} }
rule SubIncludeGPL
{
# SubInclude rule that can be used to conditionally include GPL licensed
# add-ons
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
SubInclude $(1) ;
}
}
# pragma mark - MakeLocate variants # pragma mark - MakeLocate variants
configure
Vendored
-4
View File
@@ -56,7 +56,6 @@ options:
--host-only Configure for building tools for the build host --host-only Configure for building tools for the build host
only. Haiku cannot be built when configured like only. Haiku cannot be built when configured like
this. this.
--include-gpl-addons Include GPL licensed add-ons.
--include-patented-code Enable code that is known to implemented patented --include-patented-code Enable code that is known to implemented patented
ideas and techniques. If this option is not ideas and techniques. If this option is not
specified, the resulting distribution may still specified, the resulting distribution may still
@@ -421,7 +420,6 @@ fi
# #
HOST_GCC_RAW_VERSION=`$CC -dumpversion` HOST_GCC_RAW_VERSION=`$CC -dumpversion`
HOST_GCC_MACHINE=`$CC -dumpmachine` HOST_GCC_MACHINE=`$CC -dumpmachine`
HAIKU_INCLUDE_GPL_ADDONS=0
HAIKU_INCLUDE_PATENTED_CODE=0 HAIKU_INCLUDE_PATENTED_CODE=0
HAIKU_INCLUDE_SOURCES=0 HAIKU_INCLUDE_SOURCES=0
HAIKU_INCLUDE_3RDPARTY=0 HAIKU_INCLUDE_3RDPARTY=0
@@ -576,7 +574,6 @@ while [ $# -gt 0 ] ; do
;; ;;
--enable-multiuser) HAIKU_ENABLE_MULTIUSER=1; shift 1;; --enable-multiuser) HAIKU_ENABLE_MULTIUSER=1; shift 1;;
--host-only) HAIKU_HOST_BUILD_ONLY=1; shift 1;; --host-only) HAIKU_HOST_BUILD_ONLY=1; shift 1;;
--include-gpl-addons) HAIKU_INCLUDE_GPL_ADDONS=1; shift 1;;
--include-patented-code) HAIKU_INCLUDE_PATENTED_CODE=1; shift 1;; --include-patented-code) HAIKU_INCLUDE_PATENTED_CODE=1; shift 1;;
--include-sources) HAIKU_INCLUDE_SOURCES=1; shift 1;; --include-sources) HAIKU_INCLUDE_SOURCES=1; shift 1;;
--include-3rdparty) HAIKU_INCLUDE_3RDPARTY=1; shift 1;; --include-3rdparty) HAIKU_INCLUDE_3RDPARTY=1; shift 1;;
@@ -836,7 +833,6 @@ cat << EOF > "$buildConfigFile"
TARGET_PLATFORM ?= "${TARGET_PLATFORM}" ; TARGET_PLATFORM ?= "${TARGET_PLATFORM}" ;
HOST_PLATFORM ?= "${HOST_PLATFORM}" ; HOST_PLATFORM ?= "${HOST_PLATFORM}" ;
HAIKU_INCLUDE_GPL_ADDONS ?= "${HAIKU_INCLUDE_GPL_ADDONS}" ;
HAIKU_INCLUDE_PATENTED_CODE ?= "${HAIKU_INCLUDE_PATENTED_CODE}" ; HAIKU_INCLUDE_PATENTED_CODE ?= "${HAIKU_INCLUDE_PATENTED_CODE}" ;
HAIKU_INCLUDE_SOURCES ?= "${HAIKU_INCLUDE_SOURCES}" ; HAIKU_INCLUDE_SOURCES ?= "${HAIKU_INCLUDE_SOURCES}" ;
HAIKU_INCLUDE_3RDPARTY ?= "${HAIKU_INCLUDE_3RDPARTY}" ; HAIKU_INCLUDE_3RDPARTY ?= "${HAIKU_INCLUDE_3RDPARTY}" ;