nixpkgs/pkgs/games/gargoyle/darwin.patch

55 lines
1.9 KiB
Diff
Raw Normal View History

2017-03-18 23:22:48 +00:00
diff --git a/Jamshared b/Jamshared
index 13db835..fd42928 100644
--- a/Jamshared
+++ b/Jamshared
@@ -79,7 +79,7 @@ if $(OS) = MACOSX
{
actions together SharedLink bind NEEDLIBS
{
- $(LINK) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS)
+ $(LINK) $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS)
}
}
else
diff --git a/tads/Jamfile b/tads/Jamfile
index 1f8829d..d8455eb 100644
--- a/tads/Jamfile
+++ b/tads/Jamfile
@@ -33,8 +33,8 @@ if $(OS) = LINUX || $(OS) = SOLARIS
if $(OS) = MACOSX
{
- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
+ SubDirCcFlags $(MAINARCH) $(ALTARCH) ;
+ LINKFLAGS = $(MAINARCH) $(ALTARCH) ;
}
SEARCH_SOURCE =
2017-08-25 22:24:21 +00:00
diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp
index 5e193a1..dce46f7 100644
--- a/tads/tads3/vmtz.cpp
+++ b/tads/tads3/vmtz.cpp
@@ -1985,5 +1985,5 @@ void CVmTimeZone::query(vmtzquery *result, int32_t dayno, int32_t daytime,
* up until that moment
*/
- result->set(tcur > 0 ? tcur - 1 : tcur);
+ result->set(tcur != 0 ? tcur - 1 : tcur);
return;
}
2017-03-18 23:22:48 +00:00
diff --git a/terps/Jamfile b/terps/Jamfile
index b5f6d52..2d1ccdb 100644
--- a/terps/Jamfile
+++ b/terps/Jamfile
@@ -185,8 +185,8 @@ if $(MAKE_GEAS) = yes
if $(OS) = MACOSX
{
- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
+ SubDirCcFlags $(MAINARCH) $(ALTARCH) ;
+ LINKFLAGS = $(MAINARCH) $(ALTARCH) ;
}
SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ;