diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-11-14 13:57:11 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-11-14 13:57:11 +0000 |
| commit | 5bb7716e36ad65eb9c8fd0e59ee51373a5e60f17 (patch) | |
| tree | 6a1abdd68ce1eb92e5440ba2cf2a17f1485225da /packages | |
| parent | 4e81b4330ca740a8a867a262aa1319a466d26063 (diff) | |
| parent | 407324d9ecd56f6506d1ac9b8b4f5b3b22a63bc7 (diff) | |
merge of '9addc8085e450d56da3a5559a74f27e8334b960b'
and 'c1863be30dcd78a9ffa2826bafd953535872103b'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/notecase/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/notecase/files/no-hardcoded-cxx.patch | 37 |
2 files changed, 37 insertions, 0 deletions
diff --git a/packages/notecase/files/.mtn2git_empty b/packages/notecase/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/notecase/files/.mtn2git_empty diff --git a/packages/notecase/files/no-hardcoded-cxx.patch b/packages/notecase/files/no-hardcoded-cxx.patch new file mode 100644 index 0000000000..6928fe6ed3 --- /dev/null +++ b/packages/notecase/files/no-hardcoded-cxx.patch @@ -0,0 +1,37 @@ +--- /tmp/Makefile 2006-11-14 12:57:44.000000000 +0100 ++++ notecase-1.2.6/Makefile 2006-11-14 13:22:57.858554000 +0100 +@@ -35,7 +35,6 @@ + + #DEBUG=-g -D_DEBUG + +-CXX=g++ + + ifdef WINDIR + EXE=.exe +@@ -63,7 +62,7 @@ + ifdef WINDIR + LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -L$(OBJ) -lz + else +- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE) ++ NLD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE) + endif + + # +@@ -122,7 +121,7 @@ + $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) + else + notecase$(EXE): updatesrc $(OBJS) +- $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) ++ $(NLD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) + endif + + # +@@ -300,7 +299,7 @@ + $(CC) $(FLAGS) -c $(GUIPATH)/_win/RegisterExtension.cpp -o $(OBJ)/RegisterExtension.o + + $(OBJ)/libz.a: +- @cd ./src/lib/zlib/; make; cp ./libz.a ../../../$(OBJ)/ ++ @cd ./src/lib/zlib/; cp ./libz.a ../../../$(OBJ)/ + + + # compile Windows resources |