diff --git a/recipes/dev/git/git.patch b/recipes/dev/git/git.patch index 6b79e055f..0e20bc967 100644 --- a/recipes/dev/git/git.patch +++ b/recipes/dev/git/git.patch @@ -152,7 +152,7 @@ diff -ruwN git-2.13.1/git-compat-util.h source/git-compat-util.h + +#ifndef DEV_NULL +#if defined(__redox__) -+#define DEV_NULL "null:" ++#define DEV_NULL "/scheme/null" +#else +#define DEV_NULL "/dev/null" +#endif diff --git a/recipes/emulators/dosbox/recipe.toml b/recipes/emulators/dosbox/recipe.toml index c93ec9bd7..b017dddaf 100644 --- a/recipes/emulators/dosbox/recipe.toml +++ b/recipes/emulators/dosbox/recipe.toml @@ -14,13 +14,14 @@ dependencies = [ ] template = "custom" script = """ +DYNAMIC_INIT export CFLAGS="-I${COOKBOOK_SYSROOT}/include/SDL" export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/SDL" -export LDFLAGS="-L${COOKBOOK_SYSROOT}/lib -static" +export LDFLAGS+=" -lorbital" COOKBOOK_CONFIGURE_FLAGS+=( --disable-opengl --disable-sdltest - --with-sdl-prefix="${COOKBOOK_SYSROOT}" + --with-sdl ) cookbook_configure diff --git a/recipes/emulators/scummvm/recipe.toml b/recipes/emulators/scummvm/recipe.toml index db6cd35cb..fe8b377b8 100644 --- a/recipes/emulators/scummvm/recipe.toml +++ b/recipes/emulators/scummvm/recipe.toml @@ -16,12 +16,12 @@ dependencies = [ "libpng", ] script = """ -export LDFLAGS="-static" +DYNAMIC_INIT -COOKBOOK_CONFIGURE="${COOKBOOK_SOURCE}/configure" +export LDFLAGS+=" -lorbital" COOKBOOK_CONFIGURE_FLAGS=( --host="${TARGET}" - --prefix="" + --prefix="/usr" --with-sdl-prefix="${COOKBOOK_SYSROOT}" --with-freetype2-prefix="${COOKBOOK_SYSROOT}" --with-png-prefix="${COOKBOOK_SYSROOT}" diff --git a/recipes/gui/orbital/recipe.toml b/recipes/gui/orbital/recipe.toml index b1a4a819e..0ae660fd4 100644 --- a/recipes/gui/orbital/recipe.toml +++ b/recipes/gui/orbital/recipe.toml @@ -1,3 +1,5 @@ +[source] +git = "https://gitlab.redox-os.org/redox-os/orbital.git" [build] template = "cargo"