chiark / gitweb /
build-package.sh: Remove broken subpackage logic
authorFredrik Fornwall <fredrik@fornwall.net>
Mon, 30 Jan 2017 01:10:22 +0000 (02:10 +0100)
committerFredrik Fornwall <fredrik@fornwall.net>
Mon, 30 Jan 2017 01:10:22 +0000 (02:10 +0100)
build-package.sh

index 87c781842e4048237c9afc18b5dc17f5e489ea6c..2a304d6e0070e118ed3773537a2e25b148ed61ac 100755 (executable)
@@ -827,10 +827,6 @@ termux_step_massage() {
                else
                        echo "TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\"" >> "$_DEVEL_SUBPACKAGE_FILE"
                fi
-               if [ x$TERMUX_PKG_CONFLICTS != x ]; then
-                       # Assume that dev packages conflicts as well.
-                       echo "TERMUX_SUBPKG_CONFLICTS=${TERMUX_PKG_CONFLICTS}-dev" >> "$_DEVEL_SUBPACKAGE_FILE"
-               fi
        fi
        # Now build all sub packages
        rm -Rf "$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages"