Patch - Solving compilation problem for Sun studio compiler

Поиск
Список
Период
Сортировка
От Dhanaraj M
Тема Patch - Solving compilation problem for Sun studio compiler
Дата
Msg-id 459C99C2.6030900@sun.com
обсуждение исходный текст
Ответы Re: Patch - Solving compilation problem for Sun studio compiler  (Dave Page <dpage@postgresql.org>)
Список pgadmin-hackers
Hi Dave

I have a Sun Studio patch which solves the -Wall problem during the
compilation.
I am not sure whether this is the right way of making the changes.
Please comment on this so that I will make necessary changes and re-submit.

PS: I will also discuss with Zdenek, who is on vacation.
*** configure.ac.orig    Thu Jan  4 10:07:55 2007
--- configure.ac    Thu Jan  4 10:15:07 2007
***************
*** 24,29 ****
--- 24,34 ----
  AC_TYPE_SIZE_T
  AC_HEADER_TIME

+ $CXX -V 2>test.txt
+ SUNCOMPILER=`awk '{if ( $2 == "Sun" ) { print "yes" } else {print "no"} }' test.txt`
+ rm -rf test.txt
+ AM_CONDITIONAL([SUN_COMPILER], [test x$SUNCOMPILER = xyes])
+
  # Checks for library functions.
  AC_FUNC_STRTOD
  AC_CHECK_FUNCS([gethostbyname inet_ntoa memmove memset strchr])
*** src/Makefile.am.orig    Thu Jan  4 10:15:49 2007
--- src/Makefile.am    Thu Jan  4 10:18:21 2007
***************
*** 40,51 ****
  include $(srcdir)/ui/module.mk
  include $(srcdir)/utils/module.mk

  if !APPBUNDLE

  nobase_dist_pkgdata_DATA = $(TMP_ui)
! AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include-I$(top_srcdir)/src/slony/include 
! AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include-I$(top_srcdir)/src/slony/include 
! AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
-I$(top_srcdir)/src/slony/include

  # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
  # for non-APPBUNDLE cases.
--- 40,59 ----
  include $(srcdir)/ui/module.mk
  include $(srcdir)/utils/module.mk

+ if !SUN_COMPILER
+   COMPILE_OPTION1=-Wall
+   COMPILE_OPTION2=-Wno-non-virtual-dtor
+ else
+   COMPILE_OPTION1=""
+   COMPILE_OPTION2=""
+ endif
+
  if !APPBUNDLE

  nobase_dist_pkgdata_DATA = $(TMP_ui)
! AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" $(COMPILE_OPTION1) $(COMPILE_OPTION2) -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include-I$(top_srcdir)/src/slony/include 
! AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" $(COMPILE_OPTION1) $(COMPILE_OPTION2) -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include-I$(top_srcdir)/src/slony/include 
! AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" $(COMPILE_OPTION1) -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include-I$(top_srcdir)/src/slony/include 

  # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
  # for non-APPBUNDLE cases.
***************
*** 54,62 ****
  else

  nobase_dist_data_DATA = $(TMP_ui)
! AM_CXXFLAGS = -Wall -Wno-non-virtual-dtor -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
-I$(top_srcdir)/src/slony/include
! AM_CPPFLAGS = -Wall -Wno-non-virtual-dtor -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
-I$(top_srcdir)/src/slony/include
! AM_CFLAGS = -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include

  install-exec-hook:
      cd $(bindir) ;\
--- 62,70 ----
  else

  nobase_dist_data_DATA = $(TMP_ui)
! AM_CXXFLAGS = $(COMPILE_OPTION1) $(COMPILE_OPTION2) -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
-I$(top_srcdir)/src/slony/include
! AM_CPPFLAGS = $(COMPILE_OPTION1) $(COMPILE_OPTION2) -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
-I$(top_srcdir)/src/slony/include
! AM_CFLAGS = $(COMPILE_OPTION1) -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
-I$(top_srcdir)/src/slony/include

  install-exec-hook:
      cd $(bindir) ;\
*** xtra/pgagent/Makefile.am.orig    Thu Jan  4 11:20:38 2007
--- xtra/pgagent/Makefile.am    Thu Jan  4 11:19:52 2007
***************
*** 30,40 ****
          $(srcdir)/include/misc.h \
          $(srcdir)/include/pgAgent.h

  if !APPBUNDLE

! AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
! AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
! AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(srcdir)/include

  install-data-local:
      $(install_sh) -c -m 644 pgagent.sql $(DESTDIR)/$(pkgdatadir)/pgagent.sql
--- 30,48 ----
          $(srcdir)/include/misc.h \
          $(srcdir)/include/pgAgent.h

+ if !SUN_COMPILER
+   COMPILE_OPTION1=-Wall
+   COMPILE_OPTION2=-Wno-non-virtual-dtor
+ else
+   COMPILE_OPTION1=""
+   COMPILE_OPTION2=""
+ endif
+
  if !APPBUNDLE

! AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" $(COMPILE_OPTION1) $(COMPILE_OPTION2) -I$(srcdir)/include
! AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" $(COMPILE_OPTION1) $(COMPILE_OPTION2) -I$(srcdir)/include
! AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" $(COMPILE_OPTION1) -I$(srcdir)/include

  install-data-local:
      $(install_sh) -c -m 644 pgagent.sql $(DESTDIR)/$(pkgdatadir)/pgagent.sql

В списке pgadmin-hackers по дате отправления:

Предыдущее
От: svn@pgadmin.org
Дата:
Сообщение: SVN Commit by guillaume: r5822 - branches/REL-1_6_0_PATCHES/pgadmin3/i18n/bg_BG
Следующее
От: Dave Page
Дата:
Сообщение: Re: Patch - Solving compilation problem for Sun studio compiler