On Sat, Oct 18, 2008 at 09:02:03AM +0200, Erik Bertelsen wrote: > 2008/10/16 Bill Stouder-Studenmund <wrstuden%netbsd.org@localhost>: > > On Thu, Oct 16, 2008 at 09:01:18AM +0000, Andrew Doran wrote: > >> On Wed, Oct 15, 2008 at 06:07:28PM +0000, Bill Stouder-Studenmund wrote: > >> > >> > Log Message: > >> > Looks like we need sa.h after all for userland. Add it back. > >> > >> Why? > > > > Because frame.h includes it. > > > > Take care, > > > > Bill > > > > In other places, the presence of <sys/sa.h> seems to cause trouble, > e.g. for kdebase3: > > /bin/sh ../../libtool --silent --tag=CXX --mode=compile c++ > -DHAVE_CONFIG_H -I. -I../.. -I/usr/pkg/qt3/include -I/usr/pkg/include > -I/usr/pkg/include -I/usr/pkg/include -I/usr/pkg/include/freetype2 > -DQT_THREAD_SUPPORT -I/usr/pkg/include -I/usr/include > -DLDAP_DEPRECATED -I/usr/pkg/qt3/include -I/usr/pkg/include/freetype2 > -I/usr/include/krb5 -D_LARGE_FILES=1 -DINFO_OPENGL_AVAILABLE > -Wno-long-long -Wundef -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG > -O2 -O2 -I/usr/pkg/include -I/usr/include -DLDAP_DEPRECATED > -I/usr/pkg/qt3/include -I/usr/pkg/include/freetype2 > -I/usr/include/krb5 -Wno-non-virtual-dtor -fno-exceptions > -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST > -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -D_GNU_SOURCE -MT > memory.lo -MD -MP -MF .deps/memory.Tpo -c -o memory.lo memory.cpp > mv -f .deps/memory.Tpo .deps/memory.Plo > /bin/sh ../../libtool --silent --tag=CXX --mode=compile c++ > -DHAVE_CONFIG_H -I. -I../.. -I/usr/pkg/qt3/include -I/usr/pkg/include > -I/usr/pkg/include -I/usr/pkg/include -I/usr/pkg/include/freetype2 > -DQT_THREAD_SUPPORT -I/usr/pkg/include -I/usr/include > -DLDAP_DEPRECATED -I/usr/pkg/qt3/include -I/usr/pkg/include/freetype2 > -I/usr/include/krb5 -D_LARGE_FILES=1 -DINFO_OPENGL_AVAILABLE > -Wno-long-long -Wundef -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG > -O2 -O2 -I/usr/pkg/include -I/usr/include -DLDAP_DEPRECATED > -I/usr/pkg/qt3/include -I/usr/pkg/include/freetype2 > -I/usr/include/krb5 -Wno-non-virtual-dtor -fno-exceptions > -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST > -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -D_GNU_SOURCE -MT > opengl.lo -MD -MP -MF .deps/opengl.Tpo -c -o opengl.lo opengl.cpp > opengl.cpp:230: warning: unused parameter 'GetProcAddress' > opengl.cpp:79: warning: 'int ReadPipe(QString, QStringList&)' defined > but not used > mv -f .deps/opengl.Tpo .deps/opengl.Plo > /bin/sh ../../libtool --silent --tag=CXX --mode=link c++ > -DINFO_OPENGL_AVAILABLE -Wno-long-long -Wundef -Wall -W > -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2 -O2 -I/usr/pkg/include > -I/usr/include -DLDAP_DEPRECATED -I/usr/pkg/qt3/include > -I/usr/pkg/include/freetype2 -I/usr/include/krb5 -Wno-non-virtual-dtor > -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE > -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION > -D_GNU_SOURCE -L/usr/pkg/qt3/lib -L/usr/pkg/lib -L/usr/pkg/qt3/lib > -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib > -Wl,-R/usr/pkg/qt3/lib -module -avoid-version -no-undefined > -L/usr/pkg/qt3/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib > -Wl,-R/usr/lib -Wl,-R/usr/pkg/qt3/lib -o kcm_info.la -rpath > /usr/pkg/lib/kde3 main.lo memory.lo opengl.lo -lkdeui -lGLU -lGL > -lX11 -Wl,-E > .libs/memory.o:(.bss+0x0): multiple definition of `sa_system_disabled' > .libs/main.o:(.bss+0x0): first defined here > gmake[3]: *** [kcm_info.la] Error 1 > gmake[3]: Leaving directory > `/home/NetBSD/wrkobj/x11/kdebase3/work.i386/kdebase-3.5.10/kcontrol/info' > gmake[2]: *** [all-recursive] Error 1 > gmake[2]: Leaving directory > `/home/NetBSD/wrkobj/x11/kdebase3/work.i386/kdebase-3.5.10/kcontrol' > gmake[1]: *** [all-recursive] Error 1 > gmake[1]: Leaving directory > `/home/NetBSD/wrkobj/x11/kdebase3/work.i386/kdebase-3.5.10' > gmake: *** [all] Error 2 > *** Error code 2 > > Stop. > make: stopped in /home/NetBSD/pkgsrc/x11/kdebase3 > *** Error code 1 > > sa.h contains 'int sa_system_disabled;' without an extern > specification which looks suspicious to me. That's fine in the kernel. This definition is now, as of rev 1.13 of sa.h, wrapped in #ifdef _KERNEL. We should thus not trip up this issue. Take care, Bill
Attachment:
pgpic4YsFVhqZ.pgp
Description: PGP signature