Skip to content

./make/prefix.patch breaks SVR4 compatibility #11

@ryao

Description

@ryao

Please excuse the lack of a pull request, but I am having too much fun hacking at the moment. Anyway, restoring compatibility is simple:

diff --git a/usr/src/make_src/Make/lib/makestate/src/Variant.mk b/usr/src/make_src/Make/lib/makestate/src/Variant.mk
index a961615..d906559 100644
--- a/usr/src/make_src/Make/lib/makestate/src/Variant.mk
+++ b/usr/src/make_src/Make/lib/makestate/src/Variant.mk
@@ -71,9 +66,9 @@ install: all
        ${INSTALL} -d ${DESTDIR}/${PREFIX}/lib/$(VAR_DIR)
        ${RM} ${DESTDIR}/${PREFIX}/lib$(VAR_DIR)/$(DLIBNAME)
        ${INSTALL} $(DLIBNAME) ${DESTDIR}/${PREFIX}/lib$(VAR_DIR)
-       if [[ -n "$(VAR_DIR)" && ! -h "${DESTDIR}/${PREFIX}/lib/64"  ]]; then \
+       if [ -n "$(VAR_DIR)" -a ! -h "${DESTDIR}/${PREFIX}/lib/64" ]; then \
            cd ${DESTDIR}/${PREFIX}/lib; \
-           ln -s $$(basename $(VAR_DIR)) 64; \
+           ln -s `basename $(VAR_DIR)` 64; \
        else \
                /bin/true; \
        fi

By the way, how did this regression get past your testing?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions