From ff0184bed0a0764ab987e4585862b6fff3d7b0d1 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sun, 30 Jul 2017 14:13:42 -0400
Subject: [PATCH] Remove GPL-add-ons build machinery.

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.
---
 build/jam/BuildFeatures | 5 -----
 build/jam/MiscRules     | 9 ---------
 configure               | 4 ----
 3 files changed, 18 deletions(-)

diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index eb3c34ebf0..fec1521fe0 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -677,10 +677,5 @@ if $(TARGET_PACKAGING_ARCH) = x86_64 {
 	}
 }
 
-# GPL add-ons
-if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
-	EnableBuildFeatures gpl ;
-}
-
 # ATA Drivers + Bus
 EnableBuildFeatures ata ;
diff --git a/build/jam/MiscRules b/build/jam/MiscRules
index bf97fbb91e..ec154755ee 100644
--- a/build/jam/MiscRules
+++ b/build/jam/MiscRules
@@ -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
 
diff --git a/configure b/configure
index 31f041c8cb..79c924e6ab 100755
--- a/configure
+++ b/configure
@@ -56,7 +56,6 @@ options:
   --host-only                 Configure for building tools for the build host
                               only. Haiku cannot be built when configured like
                               this.
-  --include-gpl-addons        Include GPL licensed add-ons.
   --include-patented-code     Enable code that is known to implemented patented
                               ideas and techniques. If this option is not
                               specified, the resulting distribution may still
@@ -421,7 +420,6 @@ fi
 #
 HOST_GCC_RAW_VERSION=`$CC -dumpversion`
 HOST_GCC_MACHINE=`$CC -dumpmachine`
-HAIKU_INCLUDE_GPL_ADDONS=0
 HAIKU_INCLUDE_PATENTED_CODE=0
 HAIKU_INCLUDE_SOURCES=0
 HAIKU_INCLUDE_3RDPARTY=0
@@ -576,7 +574,6 @@ while [ $# -gt 0 ] ; do
 			;;
 		--enable-multiuser)	HAIKU_ENABLE_MULTIUSER=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-sources)	HAIKU_INCLUDE_SOURCES=1; shift 1;;
 		--include-3rdparty)	HAIKU_INCLUDE_3RDPARTY=1; shift 1;;
@@ -836,7 +833,6 @@ cat << EOF > "$buildConfigFile"
 TARGET_PLATFORM 			?= "${TARGET_PLATFORM}" ;
 HOST_PLATFORM				?= "${HOST_PLATFORM}" ;
 
-HAIKU_INCLUDE_GPL_ADDONS			?= "${HAIKU_INCLUDE_GPL_ADDONS}" ;
 HAIKU_INCLUDE_PATENTED_CODE			?= "${HAIKU_INCLUDE_PATENTED_CODE}" ;
 HAIKU_INCLUDE_SOURCES				?= "${HAIKU_INCLUDE_SOURCES}" ;
 HAIKU_INCLUDE_3RDPARTY				?= "${HAIKU_INCLUDE_3RDPARTY}" ;