From owner-svn-src-user@freebsd.org Tue Nov 10 13:24:51 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6AA84A2A5FF for ; Tue, 10 Nov 2015 13:24:51 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 44DAE1047; Tue, 10 Nov 2015 13:24:51 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAADOoSH042709; Tue, 10 Nov 2015 13:24:50 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAADOoHA042708; Tue, 10 Nov 2015 13:24:50 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201511101324.tAADOoHA042708@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: uqs set sender to uqs@FreeBSD.org using -f From: Ulrich Spoerlein Date: Tue, 10 Nov 2015 13:24:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r290657 - user/uqs/git_conv/svn2git/src X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2015 13:24:51 -0000 Author: uqs Date: Tue Nov 10 13:24:50 2015 New Revision: 290657 URL: https://svnweb.freebsd.org/changeset/base/290657 Log: Regenerate Makefile via qmake-qt4 ... to make this compile with recent QT4 ports on clang-based FreeBSD systems. Modified: user/uqs/git_conv/svn2git/src/Makefile Modified: user/uqs/git_conv/svn2git/src/Makefile ============================================================================== --- user/uqs/git_conv/svn2git/src/Makefile Tue Nov 10 13:20:21 2015 (r290656) +++ user/uqs/git_conv/svn2git/src/Makefile Tue Nov 10 13:24:50 2015 (r290657) @@ -1,20 +1,20 @@ ############################################################################# # Makefile for building: ../svn-all-fast-export -# Generated by qmake (2.01a) (Qt 4.8.2) on: Fri Dec 7 14:04:57 2012 +# Generated by qmake (2.01a) (Qt 4.8.7) on: Tue Nov 10 14:23:11 2015 # Project: src.pro # Template: app -# Command: /usr/local/bin/qmake-qt4 -unix -o Makefile src.pro +# Command: /usr/local/bin/qmake-qt4 -o Makefile src.pro ############################################################################# ####### Compiler, tools and options -CC = gcc -CXX = g++ -DEFINES = -DVER="\"e29719690762be6add7d550cab9180766746f4e0\"" -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -O2 -Wall -W $(DEFINES) -CXXFLAGS = -pipe -O2 -Wall -W $(DEFINES) -INCPATH = -I/usr/local/share/qt4/mkspecs/freebsd-g++ -I. -I/usr/local/include/qt4/QtCore -I/usr/local/include/qt4 -I. -I/usr/include/subversion-1 -I/usr/local/include/subversion-1 -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/local/include/apr-1 -I. -I/usr/local/include/qt4 -I/usr/local/include -LINK = g++ +CC = clang +CXX = clang++ +DEFINES = -DVER="\"fa63382f9549c6ae1df7b8880d9cced531ab4e98\"" -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O2 -Wall -W -pthread -D_THREAD_SAFE $(DEFINES) +CXXFLAGS = -pipe -O2 -Wall -W -pthread -D_THREAD_SAFE $(DEFINES) +INCPATH = -I/usr/local/share/qt4/mkspecs/freebsd-clang -I. -I/usr/local/include/qt4/QtCore -I/usr/local/include/qt4 -I. -I/usr/include/subversion-1 -I/usr/local/include/subversion-1 -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/local/include/apr-1 -I. -I/usr/local/include/qt4 -I/usr/local/include +LINK = clang++ LFLAGS = -Wl,-O1 -pthread -Wl,-rpath,/usr/local/lib/qt4 LIBS = $(SUBLIBS) -L/usr/local/lib/qt4 -L/usr/local/lib -lsvn_fs-1 -lsvn_repos-1 -lapr-1 -lsvn_subr-1 -lQtCore -L/usr/local/lib/qt4 -L/usr/local/lib AR = ar cqs @@ -24,12 +24,12 @@ TAR = tar -cf COMPRESS = gzip -9f COPY = cp -f SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -R -STRIP = -INSTALL_FILE = $(COPY_FILE) +COPY_FILE = cp -f +COPY_DIR = cp -f -R +STRIP = strip +INSTALL_FILE = install -m 644 -p INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = $(COPY_FILE) +INSTALL_PROGRAM = install -m 755 -p DEL_FILE = rm -f SYMLINK = ln -f -s DEL_DIR = rmdir @@ -54,10 +54,11 @@ OBJECTS = ruleparser.o \ main.o \ CommandLineParser.o DIST = /usr/local/share/qt4/mkspecs/common/unix.conf \ + /usr/local/share/qt4/mkspecs/common/freebsd.conf \ /usr/local/share/qt4/mkspecs/common/gcc-base.conf \ /usr/local/share/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/local/share/qt4/mkspecs/common/g++-base.conf \ - /usr/local/share/qt4/mkspecs/common/g++-unix.conf \ + /usr/local/share/qt4/mkspecs/common/clang.conf \ + /usr/local/share/qt4/mkspecs/common/clang-unix.conf \ /usr/local/share/qt4/mkspecs/qconfig.pri \ /usr/local/share/qt4/mkspecs/features/qt_functions.prf \ /usr/local/share/qt4/mkspecs/features/qt_config.prf \ @@ -65,10 +66,11 @@ DIST = /usr/local/share/qt4/mks /usr/local/share/qt4/mkspecs/features/default_pre.prf \ /usr/local/share/qt4/mkspecs/features/release.prf \ /usr/local/share/qt4/mkspecs/features/default_post.prf \ + /usr/local/share/qt4/mkspecs/features/shared.prf \ /usr/local/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/local/share/qt4/mkspecs/features/unix/thread.prf \ /usr/local/share/qt4/mkspecs/features/warn_on.prf \ /usr/local/share/qt4/mkspecs/features/qt.prf \ + /usr/local/share/qt4/mkspecs/features/unix/thread.prf \ /usr/local/share/qt4/mkspecs/features/moc.prf \ /usr/local/share/qt4/mkspecs/features/resources.prf \ /usr/local/share/qt4/mkspecs/features/uic.prf \ @@ -108,11 +110,12 @@ $(TARGET): $(OBJECTS) @$(CHK_DIR_EXISTS) ../ || $(MKDIR) ../ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) -Makefile: src.pro /usr/local/share/qt4/mkspecs/freebsd-g++/qmake.conf /usr/local/share/qt4/mkspecs/common/unix.conf \ +Makefile: src.pro /usr/local/share/qt4/mkspecs/freebsd-clang/qmake.conf /usr/local/share/qt4/mkspecs/common/unix.conf \ + /usr/local/share/qt4/mkspecs/common/freebsd.conf \ /usr/local/share/qt4/mkspecs/common/gcc-base.conf \ /usr/local/share/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/local/share/qt4/mkspecs/common/g++-base.conf \ - /usr/local/share/qt4/mkspecs/common/g++-unix.conf \ + /usr/local/share/qt4/mkspecs/common/clang.conf \ + /usr/local/share/qt4/mkspecs/common/clang-unix.conf \ /usr/local/share/qt4/mkspecs/qconfig.pri \ /usr/local/share/qt4/mkspecs/features/qt_functions.prf \ /usr/local/share/qt4/mkspecs/features/qt_config.prf \ @@ -120,10 +123,11 @@ Makefile: src.pro /usr/local/share/qt4/ /usr/local/share/qt4/mkspecs/features/default_pre.prf \ /usr/local/share/qt4/mkspecs/features/release.prf \ /usr/local/share/qt4/mkspecs/features/default_post.prf \ + /usr/local/share/qt4/mkspecs/features/shared.prf \ /usr/local/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/local/share/qt4/mkspecs/features/unix/thread.prf \ /usr/local/share/qt4/mkspecs/features/warn_on.prf \ /usr/local/share/qt4/mkspecs/features/qt.prf \ + /usr/local/share/qt4/mkspecs/features/unix/thread.prf \ /usr/local/share/qt4/mkspecs/features/moc.prf \ /usr/local/share/qt4/mkspecs/features/resources.prf \ /usr/local/share/qt4/mkspecs/features/uic.prf \ @@ -131,12 +135,13 @@ Makefile: src.pro /usr/local/share/qt4/ /usr/local/share/qt4/mkspecs/features/lex.prf \ /usr/local/share/qt4/mkspecs/features/include_source_dir.prf \ /usr/local/lib/qt4/libQtCore.prl - $(QMAKE) -unix -o Makefile src.pro + $(QMAKE) -o Makefile src.pro /usr/local/share/qt4/mkspecs/common/unix.conf: +/usr/local/share/qt4/mkspecs/common/freebsd.conf: /usr/local/share/qt4/mkspecs/common/gcc-base.conf: /usr/local/share/qt4/mkspecs/common/gcc-base-unix.conf: -/usr/local/share/qt4/mkspecs/common/g++-base.conf: -/usr/local/share/qt4/mkspecs/common/g++-unix.conf: +/usr/local/share/qt4/mkspecs/common/clang.conf: +/usr/local/share/qt4/mkspecs/common/clang-unix.conf: /usr/local/share/qt4/mkspecs/qconfig.pri: /usr/local/share/qt4/mkspecs/features/qt_functions.prf: /usr/local/share/qt4/mkspecs/features/qt_config.prf: @@ -144,10 +149,11 @@ Makefile: src.pro /usr/local/share/qt4/ /usr/local/share/qt4/mkspecs/features/default_pre.prf: /usr/local/share/qt4/mkspecs/features/release.prf: /usr/local/share/qt4/mkspecs/features/default_post.prf: +/usr/local/share/qt4/mkspecs/features/shared.prf: /usr/local/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf: -/usr/local/share/qt4/mkspecs/features/unix/thread.prf: /usr/local/share/qt4/mkspecs/features/warn_on.prf: /usr/local/share/qt4/mkspecs/features/qt.prf: +/usr/local/share/qt4/mkspecs/features/unix/thread.prf: /usr/local/share/qt4/mkspecs/features/moc.prf: /usr/local/share/qt4/mkspecs/features/resources.prf: /usr/local/share/qt4/mkspecs/features/uic.prf: @@ -156,11 +162,11 @@ Makefile: src.pro /usr/local/share/qt4/ /usr/local/share/qt4/mkspecs/features/include_source_dir.prf: /usr/local/lib/qt4/libQtCore.prl: qmake: FORCE - @$(QMAKE) -unix -o Makefile src.pro + @$(QMAKE) -o Makefile src.pro dist: - @$(CHK_DIR_EXISTS) .tmp/svn-all-fast-export1.0.0 || $(MKDIR) .tmp/svn-all-fast-export1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/svn-all-fast-export1.0.0/ && $(COPY_FILE) --parents ruleparser.h repository.h svn.h CommandLineParser.h .tmp/svn-all-fast-export1.0.0/ && $(COPY_FILE) --parents ruleparser.cpp repository.cpp svn.cpp main.cpp CommandLineParser.cpp .tmp/svn-all-fast-export1.0.0/ && (cd `dirname .tmp/svn-all-fast-export1.0.0` && $(TAR) svn-all-fast-export1.0.0.tar svn-all-fast-export1.0.0 && $(COMPRESS) svn-all-fast-export1.0.0.tar) && $(MOVE) `dirname .tmp/svn-all-fast-export1.0.0`/svn-all-fast-export1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/svn-all-fast-export1.0.0 + @$(CHK_DIR_EXISTS) .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98 || $(MKDIR) .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98/ && $(COPY_FILE) --parents ruleparser.h repository.h svn.h CommandLineParser.h .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98/ && $(COPY_FILE) --parents ruleparser.cpp repository.cpp svn.cpp main.cpp CommandLineParser.cpp .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98/ && (cd `dirname .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98` && $(TAR) svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98.tar svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98 && $(COMPRESS) svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98.tar) && $(MOVE) `dirname .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98`/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98.tar.gz . && $(DEL_FILE) -r .tmp/svn-all-fast-exportfa63382f9549c6ae1df7b8880d9cced531ab4e98 clean:compiler_clean