diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-07-19 11:24:20 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-07-19 11:24:20 -0400 |
| commit | 56c7f1a1c7ca3aef7200fe9d148633070f0908dc (patch) | |
| tree | 31807a50598560c84fe979887f3b14ecf8eb7d40 /usr/src/Targetdirs | |
| parent | 81f8ded9e0469715043eb450f73e96578cb80240 (diff) | |
| parent | 708bde8c8780e5414779e4d9e7a7648886a4700e (diff) | |
| download | illumos-joyent-OS-8397.tar.gz | |
[illumos-gate merge]OS-8397
commit 708bde8c8780e5414779e4d9e7a7648886a4700e
14786 remove packaging support for SPARC
commit 70143b9fb6146f632b4b5d924e508df293b600df
14769 remove support for Python 2.x
Conflicts:
manifest
usr/src/cmd/mdb/Makefile.module
usr/src/tools/onbld/Checks/DbLookups.py
Diffstat (limited to 'usr/src/Targetdirs')
| -rw-r--r-- | usr/src/Targetdirs | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index 6dcd346271..7e30546e68 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -70,22 +70,7 @@ sparc_64ONLY= $(POUND_SIGN) $(64ONLY) MACH32_DIRS=/usr/ucb/$(MACH32) -PYTHON2_DIRS= -PYTHON2_64DIRS= -PYTHON3_DIRS= - -$(BUILDPY2)PYTHON2_DIRS += \ - /usr/lib/python$(PYTHON_VERSION) \ - /usr/lib/python$(PYTHON_VERSION)/vendor-packages \ - /usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris \ - /usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs - -$(BUILDPY2)PYTHON2_64DIRS += \ - /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 \ - /usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/64 \ - /usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/64 - -$(BUILDPY3)PYTHON3_DIRS += \ +PYTHON3_DIRS = \ /usr/lib/python$(PYTHON3_VERSION) \ /usr/lib/python$(PYTHON3_VERSION)/vendor-packages \ /usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris \ @@ -326,7 +311,6 @@ DIRS= \ /usr/net \ /usr/net/servers \ /usr/lib/pool \ - $(PYTHON2_DIRS) \ /usr/lib/rcap \ /usr/lib/rcap/$(MACH32) \ /usr/lib/sa \ @@ -494,7 +478,6 @@ DIRS64= \ /usr/lib/lwp/$(MACH64) \ /usr/lib/mdb/kvm/$(MACH64) \ /usr/lib/mdb/proc/$(MACH64) \ - $(PYTHON2_64DIRS) \ $(PYTHON3_DIRS) \ /usr/lib/rcap/$(MACH64) \ /usr/lib/sasl/$(MACH64) \ |