From f778ae554748acb84b088fd2754ad78cb1e00505 Mon Sep 17 00:00:00 2001
From: DavidKorczynski <david@adalogics.com>
Date: Wed, 9 Nov 2022 14:48:39 +0100
Subject: [PATCH] idna, pyyaml, glom: cleanup build (#8956)

This variable is no longer needed by fuzz-introspector python version
for these projects.

Signed-off-by: David Korczynski <david@adalogics.com>

Signed-off-by: David Korczynski <david@adalogics.com>
---
 projects/glom/build.sh     |  3 ---
 projects/glom/fuzz_glom.py | 10 +++++-----
 projects/idna/build.sh     |  3 ---
 projects/pyyaml/build.sh   |  6 +-----
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/projects/glom/build.sh b/projects/glom/build.sh
index 506f13bfb..95f3540d8 100644
--- a/projects/glom/build.sh
+++ b/projects/glom/build.sh
@@ -15,9 +15,6 @@
 #
 ################################################################################
 
-# For fuzz-introspector
-export PYFUZZPACKAGE=$PWD/glom/
-
 pip3 install .
 
 # Build fuzzers in $OUT.
diff --git a/projects/glom/fuzz_glom.py b/projects/glom/fuzz_glom.py
index 04b2e5500..ed29575ec 100644
--- a/projects/glom/fuzz_glom.py
+++ b/projects/glom/fuzz_glom.py
@@ -17,7 +17,7 @@ import atheris
 import sys
 
 with atheris.instrument_imports():
-  from glom import *
+  import glom
   import json
 
 
@@ -26,8 +26,8 @@ def TestOneInput(data):
 
   val = {'d': {'e': ['f']}}
   try:
-    core.glom(val, fdp.ConsumeString(30))
-  except core.PathAccessError:
+    glom.core.glom(val, fdp.ConsumeString(30))
+  except glom.core.PathAccessError:
     pass
 
   # Create a random dictionary. In this case if any
@@ -42,8 +42,8 @@ def TestOneInput(data):
 
   # Use random dict as input to glom
   try:
-    core.glom(data, fdp.ConsumeString(30))
-  except core.PathAccessError:
+    glom.core.glom(data, fdp.ConsumeString(30))
+  except glom.core.PathAccessError:
     pass
 
 
diff --git a/projects/idna/build.sh b/projects/idna/build.sh
index 3932a04c0..1974eb7eb 100755
--- a/projects/idna/build.sh
+++ b/projects/idna/build.sh
@@ -15,9 +15,6 @@
 #
 ################################################################################
 
-# For fuzz-introspector
-export PYFUZZPACKAGE=$PWD/
-
 pip3 install .
 for fuzzer in $(find $SRC -name 'fuzz_*.py'); do
   compile_python_fuzzer $fuzzer
diff --git a/projects/pyyaml/build.sh b/projects/pyyaml/build.sh
index 7fe41721f..b5fbb755f 100644
--- a/projects/pyyaml/build.sh
+++ b/projects/pyyaml/build.sh
@@ -15,11 +15,7 @@
 #
 ################################################################################
 cd pyyaml
-
-# For fuzz-introspector
-export PYFUZZPACKAGE=$PWD/lib/
-
-python3 ./setup.py --without-libyaml install
+pip3 install .
 
 # Build fuzzers in $OUT.
 for fuzzer in $(find $SRC -name 'fuzz_*.py'); do