Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
publicarray committed Dec 4, 2020
1 parent bcf74d2 commit a383a5d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions cross/jackett/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PKG_NAME = Jackett
PKG_VERS = 0.16.2294
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-dotnet-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/Jackett/Jackett/archive
PKG_DIR = Jackett-$(PKG_VERS)/src

Expand All @@ -14,7 +14,7 @@ LICENSE = GNU GPL v2

DOTNET_OPTIMIZE = 1
DOTNET_PACKAGE_NAME = Jackett.Server

DOTNET_OUTPUT_PATH = share
SET_VERSION = /p:AssemblyVersion=$(PKG_VERS) /p:FileVersion=$(PKG_VERS) /p:InformationalVersion=$(PKG_VERS) /p:Version=$(PKG_VERS)
DOTNET_BUILD_PROPERTIES += $(SET_VERSION)

Expand Down
2 changes: 1 addition & 1 deletion cross/jackett/PLIST
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rsc:share/jackett
rsc:share/
2 changes: 1 addition & 1 deletion mk/spksrc.cross-dotnet-env.mk
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ endif

DOTNET_BUILD_ARGS += --runtime $(DOTNET_OS)-$(DOTNET_ARCH)

DOTNET_BUILD_ARGS += --output="$(STAGING_INSTALL_PREFIX)"
DOTNET_BUILD_ARGS += --output="$(STAGING_INSTALL_PREFIX)/$(DOTNET_OUTPUT_PATH)"

ifeq ($(strip $(DOTNET_OPTIMIZE)),1)
# PublishReadyToRun improve the startup time of your .NET Core application
Expand Down
9 changes: 6 additions & 3 deletions mk/spksrc.cross-dotnet.mk
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# Build dotnet programs
#
#
# prerequisites:
# - cross/module depends on native/dotnet only
# - module does not require kernel (REQUIRE_KERNEL)
#
#
# remarks:
# - Restriction for minimal DSM version is not supported (toolchains are not used for dotnet builds)
# - CONFIGURE_TARGET is not supported/bypassed
# - most content is taken from spksrc.go.mk and modified for dotnet build and install
#
#
# NOTE: Don't strip the self-contained binary!
# aka don't use 'bin' for the PLIST use 'rsc' instead.
# It *will* break the program.

# Common makefiles
include ../../mk/spksrc.common.mk
Expand Down

0 comments on commit a383a5d

Please sign in to comment.