From c2d056ee9a044b467a6f18e5715a23b3553a55e8 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 9 Oct 2009 20:22:35 +0000
Subject: [PATCH] 2009-10-09 22:22 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * ChangeLog     * Marked TODO/TOFIX items as DONE.

  * utils/hbmk2/hbmk2.prg
    % Cleaned -KPIC option handling.

  * contrib/hbsqlit3/hbsqlit3.ch
    - Deleted hack with SQLITE_TEXT macro.
---
 harbour/ChangeLog                    | 29 +++++++++++++++++++---------
 harbour/contrib/hbsqlit3/hbsqlit3.ch |  8 ++------
 harbour/utils/hbmk2/hbmk2.prg        |  4 ----
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e2ae3de17f..7f677b1ec0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-09 22:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * ChangeLog
+    * Marked TODO/TOFIX items as DONE.
+
+  * utils/hbmk2/hbmk2.prg
+    % Cleaned -KPIC option handling.
+
+  * contrib/hbsqlit3/hbsqlit3.ch
+    - Deleted hack with SQLITE_TEXT macro.
+
 2009-10-09 16:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   - source
   + src
@@ -72,6 +82,7 @@
       #endif
       ---
       Seems wrong to me.
+      [DONE - There was no feedback, so HACK DELETED]
 
 2009-10-07 16:26 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/gtwvg/wvtwin.ch
@@ -1526,9 +1537,9 @@
     + Attempt to add link creation for dynlibs.
       Not tested yet.
     ; TODO: darwin needs even more sopthistication. [DONE]
-    ; TODO: clean support is missing yet.
-    ; TODO: add this to rest of targets.
-    ; TODO: install support?
+    ; TODO: clean support is missing yet. [DONE]
+    ; TODO: add this to rest of targets. [DONE]
+    ; TODO: install support? [DONE]
 
   * source/vm/vmmt/Makefile
     ! Disabled HB_HVM_ALL for linux-icc, because it causes compiler internal
@@ -1583,7 +1594,7 @@
       method, component detections, install dir forming and creation.
     ; Please review me and test.
     ; TODO: Maybe above tasks in postinst.sh should only be
-            executed when HB_BUILD_PKG=yes.
+            executed when HB_BUILD_PKG=yes. [NOT RELEVANT ANYMORE]
 
   * config/global.mk
     ! Fixed to only use lib64 dir if it exists. Please review/test
@@ -2655,8 +2666,8 @@
       this is necessary and what are the rules here. On linux/ubuntu
       it made no difference whatsoever.
     ; Please test.
-    ; TODO: hbmk2 will have to updated once we've settled with fpic
-            setup in GNU Make.
+    ; TODO: hbmk2 will have to be updated once we've settled with fpic
+            setup in GNU Make. [DONE]
 
   * config/darwin/icc.mk
     - Deleted commented fpic option. On darwin this is not needed,
@@ -2798,7 +2809,7 @@
     ! Added missing DWORD casts to -1 values.
     * Slightly renamed Win_ComSetTimeouts() and made it static.
     ; TOFIX: I had to comment out WIN_COMINIT() function since HB_INITFUNC()
-             doesn't exist in Harbour.
+             doesn't exist in Harbour. [DONE]
 
 2009-09-11 11:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
@@ -3490,7 +3501,7 @@
         in this case.
       - hbmk2 will use local builds of these libs if they are present
         in lib dir.
-    ; TOFIX: hbmk script.
+    ; TOFIX: hbmk script. [DONE]
     ; TOFIX: dos builds. cmdline lenghts are most probably too big for them.
     ; NOTE: Bumps are expected.
     ; NOTE: I've yet to test/verify it.
@@ -6739,7 +6750,7 @@
     + Added experimental dynamic lib creation.
     ; TODO: Parameterize internal versioning and name. [DONE]
     ; TODO: Add links (although this may better be done in
-            postinst state most probably). Opinions?
+            postinst state most probably). Opinions? [DONE]
 
   * source/Makefile
     + Adjusted dynamic lib name for *nix systems.
diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.ch b/harbour/contrib/hbsqlit3/hbsqlit3.ch
index 07f48afc7f..3040288daa 100644
--- a/harbour/contrib/hbsqlit3/hbsqlit3.ch
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.ch
@@ -60,12 +60,8 @@
 /* Fundamental Datatypes */
 #define SQLITE_INTEGER                     1
 #define SQLITE_FLOAT                       2
-#ifdef SQLITE_TEXT
-   #undef SQLITE_TEXT
-#else
-   #define SQLITE_TEXT                     3
-#endif
-#define SQLITE3_TEXT                       3
+#define SQLITE_TEXT                        3
+#define SQLITE3_TEXT                       SQLITE_TEXT
 #define SQLITE_BLOB                        4
 #define SQLITE_NULL                        5
                                            
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index fb4dfa9a50..f1e5f30f06 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3043,7 +3043,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTD ], "-fast" )
             AAdd( hbmk[ _HBMK_aOPTD ], "-xnolibmopt" )
          ENDIF
-         AAdd( hbmk[ _HBMK_aOPTC ], "-KPIC" )
          IF hbmk[ _HBMK_lINC ] .AND. ! Empty( cWorkDir )
             cOpt_CompC += " {IC} -o {OO}"
          ELSE
@@ -3056,9 +3055,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cLibLibExt := ".a"
          cBin_Dyn := cBin_CompC
          cOpt_Dyn := "-G {FD} -o {OD} {DL} {LO} {LL} {LB} {LS}"
-         IF hbmk[ _HBMK_cPLAT ] == "linux"
-            AAdd( hbmk[ _HBMK_aOPTD ], "-KPIC" )
-         ENDIF
          IF ! lStopAfterCComp
             AAdd( hbmk[ _HBMK_aOPTL ], "{LL} {LB}" )
             l_aLIBHBBASE_2 := iif( hbmk[ _HBMK_lMT ], aLIB_BASE_2_MT, aLIB_BASE_2 )